| @@ -106,7 +106,7 @@ | ||
| 106 | 106 | /** | 
| 107 | 107 | * Override this function to define which emails you want to make the web-view available and for which not. | 
| 108 | 108 | * @see Azine\EmailBundle\Services\AzineTemplateProvider::getTemplatesToStoreForWebView() | 
| 109 | - * @return array | |
| 109 | + * @return string[] | |
| 110 | 110 | */ | 
| 111 | 111 | public function getTemplatesToStoreForWebView() | 
| 112 | 112 |      { | 
| @@ -87,7 +87,7 @@ | ||
| 87 | 87 | * @param string[] $failedRecipients | 
| 88 | 88 | * @param bool $noSpoolPath | 
| 89 | 89 | * @param bool $noTransport | 
| 90 | - * @param null $msgCount | |
| 90 | + * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $msgCount | |
| 91 | 91 | * @internal param string $message | 
| 92 | 92 | * @return ContainerInterface | 
| 93 | 93 | */ | 
| @@ -148,6 +148,7 @@ | ||
| 148 | 148 | * - remove double-whitespaces and whitespaces at line beginnings and ends. | 
| 149 | 149 | * - html-special chars to their original representation (php => htmlspecialchars_decode) | 
| 150 | 150 | * and then remove all html-tags (php => strip_tags) | 
| 151 | + * @param string $html | |
| 151 | 152 | */ | 
| 152 | 153 |      public function stripAndConvertTags($html){ | 
| 153 | 154 | |
| @@ -114,18 +114,18 @@ discard block | ||
| 114 | 114 | * @param string $subject | 
| 115 | 115 | * @param String $from | 
| 116 | 116 | * @param String $fromName | 
| 117 | - * @param array|String $to | |
| 117 | + * @param string $to | |
| 118 | 118 | * @param String $toName | 
| 119 | - * @param array|String $cc | |
| 119 | + * @param null|string $cc | |
| 120 | 120 | * @param String $ccName | 
| 121 | - * @param array|String $bcc | |
| 121 | + * @param null|string $bcc | |
| 122 | 122 | * @param String $bccName | 
| 123 | 123 | * @param $replyTo | 
| 124 | 124 | * @param $replyToName | 
| 125 | 125 | * @param array $params | 
| 126 | 126 | * @param $template | 
| 127 | 127 | * @param array $attachments | 
| 128 | - * @param null $emailLocale | |
| 128 | + * @param string|null $emailLocale | |
| 129 | 129 | * @param \Swift_Message $message | 
| 130 | 130 | * @return int | 
| 131 | 131 | */ | 
| @@ -468,7 +468,7 @@ discard block | ||
| 468 | 468 | * @param array $params | 
| 469 | 469 | * @param string $template | 
| 470 | 470 | * @param string $emailLocale | 
| 471 | - * @param null $from | |
| 471 | + * @param string $from | |
| 472 | 472 | * @param null $fromName | 
| 473 | 473 | * @param \Swift_Message $message | 
| 474 | 474 | * @return bool | 
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | use Symfony\Bundle\FrameworkBundle\Translation\Translator; | 
| 10 | 10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 
| 11 | 11 | use FOS\UserBundle\Mailer\TwigSwiftMailer; | 
| 12 | -use Azine\EmailBundle\Entity\RecipientInterface; | |
| 13 | 12 | |
| 14 | 13 | /** | 
| 15 | 14 | * This Service is used to send html-emails with embedded images | 
| @@ -2,8 +2,6 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Azine\EmailBundle\Controller; | 
| 4 | 4 | |
| 5 | -use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; | |
| 6 | -use Symfony\Component\HttpFoundation\Session\Session; | |
| 7 | 5 | use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; | 
| 8 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; | 
| 9 | 7 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; | 
| @@ -94,9 +94,9 @@ discard block | ||
| 94 | 94 | |
| 95 | 95 | /** | 
| 96 | 96 | * concatenate all recipients into an array and implode with ';' to a string | 
| 97 | - * @param string|array $to | |
| 98 | - * @param string|array $cc | |
| 99 | - * @param string|array $bcc | |
| 97 | + * @param string $to | |
| 98 | + * @param string $cc | |
| 99 | + * @param string $bcc | |
| 100 | 100 | * @return string | 
| 101 | 101 | */ | 
| 102 | 102 |      protected function merge($to, $cc, $bcc){ | 
| @@ -124,7 +124,7 @@ discard block | ||
| 124 | 124 | * @param array $campaignParams | 
| 125 | 125 | * @param array $emailTemplateParams | 
| 126 | 126 | * @param string $messageId | 
| 127 | - * @param string|array $recipients | |
| 127 | + * @param string $recipients | |
| 128 | 128 | * @return string | 
| 129 | 129 | */ | 
| 130 | 130 |      protected function getGoogleAnalyticsUrl($baseUrl, $templateBaseId, array $campaignParams, array $emailTemplateParams, $messageId, $recipients){ | 
| @@ -1,22 +1,8 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | namespace Azine\EmailBundle\Tests\Controller; | 
| 3 | -use Azine\EmailBundle\DependencyInjection\AzineEmailExtension; | |
| 4 | -use Azine\EmailBundle\Services\AzineEmailTwigExtension; | |
| 5 | -use Azine\EmailBundle\Services\Pagination; | |
| 6 | -use Azine\EmailBundle\Tests\FindInFileUtil; | |
| 7 | -use Azine\EmailBundle\Services\AzineTemplateProvider; | |
| 8 | 3 | use Azine\EmailBundle\Entity\SentEmail; | 
| 9 | -use Azine\EmailBundle\Controller\AzineEmailTemplateController; | |
| 10 | 4 | use Azine\PlatformBundle\Services\EmailTemplateProvider; | 
| 11 | 5 | use Symfony\Component\DependencyInjection\ContainerInterface; | 
| 12 | -use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; | |
| 13 | -use Symfony\Component\HttpFoundation\ParameterBag; | |
| 14 | -use Symfony\Component\HttpFoundation\Request; | |
| 15 | -use Symfony\Component\HttpFoundation\Response; | |
| 16 | -use Symfony\Component\HttpFoundation\Session\Session; | |
| 17 | -use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage; | |
| 18 | -use Symfony\Component\Routing\RequestContext; | |
| 19 | -use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; | |
| 20 | 6 | use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; | 
| 21 | 7 | use Symfony\Component\DomCrawler\Crawler; | 
| 22 | 8 | use Symfony\Bundle\FrameworkBundle\Client; | 
| @@ -48,7 +48,7 @@ | ||
| 48 | 48 | /** | 
| 49 | 49 | * Displays an extended view of SentEmail entity searched by a token property | 
| 50 | 50 | * @param string $token | 
| 51 | - * @return Response | |
| 51 | + * @return \Symfony\Component\HttpFoundation\Response | |
| 52 | 52 | */ | 
| 53 | 53 | public function emailDetailsByTokenAction(Request $request, $token) | 
| 54 | 54 |      { | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Azine\EmailBundle\Entity\SentEmail; | 
| 6 | 6 | use Azine\EmailBundle\Form\SentEmailType; | 
| 7 | -use FOS\UserBundle\Model\User; | |
| 8 | 7 | use Symfony\Component\HttpFoundation\Request; | 
| 9 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 
| 10 | 9 | |