Merge pull request #203 from j0k3r/fix/giphy-image-url

Fix Giphy image/url parameter
j0k3r · Feb 5, 2019 · ca3f6ba · ca3f6ba
2 parents dd212fe + 9ea82ea
commit ca3f6ba
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 53 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/AppBundle/Extractor/Giphy.php b/src/AppBundle/Extractor/Giphy.php
@@ -60,6 +60,6 @@ public function getContent()
             return '';
         }
 
-        return '<div><h2>' . $data['title'] . '</h2><p><img src="' . $data['image'] . '"></p></div>';
+        return '<div><h2>' . $data['title'] . '</h2><p><img src="' . $data['url'] . '"></p></div>';
     }
 }
diff --git a/src/AppBundle/Form/Type/FeedType.php b/src/AppBundle/Form/Type/FeedType.php
@@ -17,11 +17,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TextType::class)
-            ->add('description', TextareaType::class, ['required' => false])
-            ->add('host', TextType::class, ['attr' => ['placeholder' => 'www.website.com']])
-            ->add('link', UrlType::class, ['attr' => ['placeholder' => 'http://www.website.com/rss']])
-            ->add('logo', UrlType::class, ['required' => false])
-            ->add('color', TextType::class, ['required' => false])
+            ->add('description', TextareaType::class, [
+                'required' => false,
+            ])
+            ->add('host', TextType::class, [
+                'attr' => [
+                    'placeholder' => 'www.website.com',
+                ],
+            ])
+            ->add('link', UrlType::class, [
+                'default_protocol' => null,
+                'attr' => [
+                    'placeholder' => 'http://www.website.com/rss',
+                ],
+            ])
+            ->add('logo', UrlType::class, [
+                'default_protocol' => null,
+                'required' => false,
+            ])
+            ->add('color', TextType::class, [
+                'required' => false,
+            ])
             ->add('parser', ChoiceType::class, [
                 'choices' => [
                     'Internal' => 'internal',

diff --git a/src/AppBundle/Form/Type/ItemTestType.php b/src/AppBundle/Form/Type/ItemTestType.php
@@ -15,9 +15,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('link', UrlType::class, [
+                'default_protocol' => null,
                 'constraints' => new Url(),
             ])
-            ->add('siteconfig', TextareaType::class, ['required' => false])
+            ->add('siteconfig', TextareaType::class, [
+                'required' => false,
+            ])
             ->add('parser', ChoiceType::class, [
                 'choices' => array_flip([
                     'internal' => 'Internal',

diff --git a/tests/AppBundle/Extractor/GiphyTest.php b/tests/AppBundle/Extractor/GiphyTest.php
@@ -40,7 +40,7 @@ public function testContent()
         $client = new Client();
 
         $mock = new Mock([
-            new Response(200, [], Stream::factory(json_encode(['title' => 'my title', 'image' => 'http://0.0.0.0/img.jpg']))),
+            new Response(200, [], Stream::factory(json_encode(['title' => 'my title', 'url' => 'http://0.0.0.0/img.jpg']))),
             new Response(200, [], Stream::factory(json_encode(''))),
             new Response(400, [], Stream::factory(json_encode('oops'))),
         ]);