native_function_invocation and php_unit_test_case_static_method_calls…

… cs rules
fazland · Apr 16, 2019 · c365785 · c365785
1 parent dbba118
commit c365785
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 101 deletions.
diff --git a/.php_cs b/.php_cs
@@ -23,5 +23,7 @@ return PhpCsFixer\Config::create()
         'not_operator_with_successor_space' => true,
         'ordered_imports' => true,
         'declare_strict_types' => true,
+        'native_function_invocation' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
     ])
 ;
diff --git a/lib/Converter/SwiftMailerConverter.php b/lib/Converter/SwiftMailerConverter.php
@@ -22,7 +22,7 @@ class SwiftMailerConverter
     public function convert(Email $email): \Swift_Message
     {
         $message = $this->createInstance()->setSubject($email->getSubject());
-        $message->setBoundary($boundary = md5(uniqid()));
+        $message->setBoundary($boundary = \md5(\uniqid()));
 
         $this->addAddresses($email, $message);
         $this->addParts($email, $message, $boundary);
@@ -87,8 +87,8 @@ protected function addAddress(\Swift_Message $email, string $type, string $addre
     protected function addParts(Email $notification, \Swift_Message $email, string $boundary)
     {
         $parts = $notification->getParts();
-        if (1 === count($parts)) {
-            $part = reset($parts);
+        if (1 === \count($parts)) {
+            $part = \reset($parts);
             $email->setBody($part->getContent(), $part->getContentType());
 
             if ($encoder = $this->getEncoder($part)) {
@@ -159,7 +159,7 @@ protected function createInstance(): \Swift_Message
     /**
      * @param Email\Part $part
      *
-     * @return null|\Swift_Encoder
+     * @return \Swift_Encoder|null
      */
     private function getEncoder(Email\Part $part)
     {

diff --git a/lib/EventListener/TwigProcessor.php b/lib/EventListener/TwigProcessor.php
@@ -47,7 +47,7 @@ protected function processPart(Email\Part $part)
             return;
         }
 
-        if (method_exists($this->twig, 'load')) {
+        if (\method_exists($this->twig, 'load')) {
             $template = $this->twig->load($part->getTemplateName());
         } else {
             $template = $this->twig->loadTemplate($part->getTemplateName());
@@ -56,7 +56,7 @@ protected function processPart(Email\Part $part)
         $email = $part->getEmail();
 
         if (empty($email->getSubject()) && $template->hasBlock('subject')) {
-            $email->setSubject(trim($template->renderBlock('subject', $part->getVars())));
+            $email->setSubject(\trim($template->renderBlock('subject', $part->getVars())));
         }
 
         $part->setContent($template->render($part->getVars()));

diff --git a/lib/Handler/Email/MailgunHandler.php b/lib/Handler/Email/MailgunHandler.php
@@ -45,7 +45,7 @@ public function __construct(Mailgun $mailgun, string $domain, string $mailerName
      */
     public function notify(NotificationInterface $notification)
     {
-        if (! class_exists('Swift_Message')) {
+        if (! \class_exists('Swift_Message')) {
             throw new \RuntimeException('You need to install swift mailer to use mailgun transport');
         }
 
@@ -74,15 +74,15 @@ public function notify(NotificationInterface $notification)
         }
 
         if ($recipientVariables = $notification->getRecipientVariables()) {
-            $postData['recipient-variables'] = json_encode($recipientVariables);
+            $postData['recipient-variables'] = \json_encode($recipientVariables);
         }
 
         $failed = [];
         $success = [];
 
-        $to = array_merge(array_values($notification->getTo()), array_values($notification->getCc()), array_values($notification->getBcc()));
+        $to = \array_merge(\array_values($notification->getTo()), \array_values($notification->getCc()), \array_values($notification->getBcc()));
         if (! empty($to)) {
-            foreach (array_chunk($to, 1000) as $to_chunk) {
+            foreach (\array_chunk($to, 1000) as $to_chunk) {
                 $result = new Result('mailgun', $this->getName());
 
                 $data = $postData;
@@ -100,7 +100,7 @@ public function notify(NotificationInterface $notification)
                 $notification->addResult($result);
             }
 
-            if (0 === count($success)) {
+            if (0 === \count($success)) {
                 throw new NotificationFailedException("Sending failed for message {$notification->getSubject()}", $failed);
             }
         }

diff --git a/lib/Handler/Email/SendGridHandler.php b/lib/Handler/Email/SendGridHandler.php
@@ -39,10 +39,10 @@ public function notify(NotificationInterface $notification)
         /** @var Email $notification */
         $fromEmails = $notification->getFrom();
 
-        if (count($fromEmails) > 1) {
+        if (\count($fromEmails) > 1) {
             throw new \Exception('With sendgrid you can use one from email address');
         }
-        $fromEmail = array_pop($fromEmails);
+        $fromEmail = \array_pop($fromEmails);
 
         $from = new SendGrid\Email(null, $fromEmail);
         $subject = $notification->getSubject();

diff --git a/lib/Handler/Sms/SkebbyHandler.php b/lib/Handler/Sms/SkebbyHandler.php
@@ -77,7 +77,7 @@ public function notify(NotificationInterface $notification)
             $notification->addResult($result);
         }
 
-        if (count($tos) === count($failedSms)) {
+        if (\count($tos) === \count($failedSms)) {
             throw new NotificationFailedException('All the sms failed to be send', ['failed_sms' => $failedSms]);
         }
     }

diff --git a/lib/Handler/Sms/TwilioHandler.php b/lib/Handler/Sms/TwilioHandler.php
@@ -38,7 +38,7 @@ public function __construct($twilio, string $name = 'default')
         $this->twilio = $twilio;
 
         if (! $twilio instanceof \Services_Twilio && ! $twilio instanceof Client) {
-            throw new \TypeError('Expected '.\Services_Twilio::class.' or '.Client::class.'. Got '.get_class($twilio));
+            throw new \TypeError('Expected '.\Services_Twilio::class.' or '.Client::class.'. Got '.\get_class($twilio));
         }
 
         parent::__construct($name);
@@ -68,7 +68,7 @@ public function notify(NotificationInterface $notification)
                 if ($this->twilio instanceof Client) {
                     unset($params['To']);
 
-                    $params = array_combine(array_map('lcfirst', array_keys($params)), $params);
+                    $params = \array_combine(\array_map('lcfirst', \array_keys($params)), $params);
 
                     $response = $this->twilio->messages->create($to, $params);
                 } else {
@@ -88,7 +88,7 @@ public function notify(NotificationInterface $notification)
                     'error_message' => $e->getMessage(),
                 ];
 
-                $this->logger->debug(get_class($e).' from Twilio: '.$e->getMessage(), [
+                $this->logger->debug(\get_class($e).' from Twilio: '.$e->getMessage(), [
                     'exception' => $e,
                     'response_status' => $e->getStatusCode(),
                 ]);
@@ -103,7 +103,7 @@ public function notify(NotificationInterface $notification)
                     'error_message' => $e->getMessage(),
                 ];
 
-                $this->logger->debug(get_class($e).' from Twilio: '.$e->getMessage(), [
+                $this->logger->debug(\get_class($e).' from Twilio: '.$e->getMessage(), [
                     'exception' => $e,
                     'response_status' => $e->getStatus(),
                     'error_info' => $e->getInfo(),
@@ -123,7 +123,7 @@ public function notify(NotificationInterface $notification)
             $notification->addResult($result);
         }
 
-        if (count($tos) === count($failedSms)) {
+        if (\count($tos) === \count($failedSms)) {
             throw new NotificationFailedException('All the sms failed to be send', ['failed_sms' => $failedSms]);
         }
     }

diff --git a/lib/HandlerSelectorStrategy/HandlerSelectorStrategyInterface.php b/lib/HandlerSelectorStrategy/HandlerSelectorStrategyInterface.php
@@ -7,11 +7,11 @@
 interface HandlerSelectorStrategyInterface
 {
     /**
-     * This method retrieve an handler choosen between handlers passed.
+     * This method retrieve an handler chosen between handlers passed.
      *
      * @param NotificationHandlerInterface[]
      *
-     * @return null|NotificationHandlerInterface
+     * @return NotificationHandlerInterface|null
      */
     public function select(array $handlers);
 }
diff --git a/lib/HandlerSelectorStrategy/RandStrategy.php b/lib/HandlerSelectorStrategy/RandStrategy.php
@@ -13,6 +13,6 @@ public function select(array $handlers)
             return null;
         }
 
-        return $handlers[mt_rand(0, count($handlers) - 1)];
+        return $handlers[\mt_rand(0, \count($handlers) - 1)];
     }
 }
diff --git a/lib/Manager/NotificationManager.php b/lib/Manager/NotificationManager.php
@@ -81,9 +81,9 @@ public function notify(NotificationInterface $notification)
         }
 
         if ($this->throwIfNotNotified && ! $notified) {
-            $message = 'No handler has been defined for '.get_class($notification);
-            if (method_exists($notification, 'getConfig')) {
-                $message .= ' ('.json_encode($notification->getConfig()).')';
+            $message = 'No handler has been defined for '.\get_class($notification);
+            if (\method_exists($notification, 'getConfig')) {
+                $message .= ' ('.\json_encode($notification->getConfig()).')';
             }
 
             throw new NotificationFailedException($message);

diff --git a/lib/Notification/Email.php b/lib/Notification/Email.php
@@ -349,7 +349,7 @@ public function setText(string $text): self
      * Get the html body of the mail if set
      * Returns NULL if no html part is present.
      *
-     * @return null|string
+     * @return string|null
      */
     public function getHtml()
     {
@@ -362,7 +362,7 @@ public function getHtml()
      * Get the plain text body of the mail if set
      * Returns NULL if no text part is present.
      *
-     * @return null|string
+     * @return string|null
      */
     public function getText()
     {
@@ -521,7 +521,7 @@ public function setContentType(string $contentType): self
      */
     public function getTags(): array
     {
-        return array_values($this->tags);
+        return \array_values($this->tags);
     }
 
     /**
@@ -533,7 +533,7 @@ public function getTags(): array
      */
     public function setTags(array $tags): self
     {
-        $this->tags = array_combine($tags, $tags);
+        $this->tags = \array_combine($tags, $tags);
 
         return $this;
     }

diff --git a/lib/Notification/Email/Attachment.php b/lib/Notification/Email/Attachment.php
@@ -50,8 +50,8 @@ public static function create(): self
     public static function createFromFile(string $filename, string $contentType = null): self
     {
         $instance = new static();
-        $instance->content = file_get_contents($filename);
-        $instance->name = basename($filename);
+        $instance->content = \file_get_contents($filename);
+        $instance->name = \basename($filename);
 
         if (null !== $contentType) {
             $instance->contentType = $contentType;

diff --git a/lib/Notification/Sms.php b/lib/Notification/Sms.php
@@ -113,7 +113,7 @@ public function setContent(string $content): self
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getFrom()
     {
@@ -171,7 +171,7 @@ public function addTo(string $to): self
      */
     public function removeTo(string $to): self
     {
-        $itemPosition = array_search($to, $this->to);
+        $itemPosition = \array_search($to, $this->to);
 
         if (false !== $itemPosition) {
             unset($this->to[$itemPosition]);

diff --git a/lib/Notifire.php b/lib/Notifire.php
@@ -65,7 +65,7 @@ public static function addNotification(string $notificationName, string $notific
         }
 
         $notificationInterfaceName = NotificationInterface::class;
-        if (! is_subclass_of($notificationClass, $notificationInterfaceName)) {
+        if (! \is_subclass_of($notificationClass, $notificationInterfaceName)) {
             $message = "Expected instance of $notificationInterfaceName, got $notificationClass";
 
             throw new UnsupportedClassException($message);
@@ -86,8 +86,11 @@ public static function addNotification(string $notificationName, string $notific
      *
      * @throws UnregisteredNotificationException
      */
-    public static function factory(string $notificationName, string $handler = 'default', array $options = [])
-    {
+    public static function factory(
+        string $notificationName,
+        string $handler = 'default',
+        array $options = []
+    ): NotificationInterface {
         if (! isset(static::$notifications[$notificationName])) {
             throw new UnregisteredNotificationException();
         }
@@ -108,7 +111,7 @@ public static function factory(string $notificationName, string $handler = 'defa
      *
      * @throws UnregisteredNotificationException
      */
-    public static function __callStatic(string $name, array $arguments)
+    public static function __callStatic(string $name, array $arguments): NotificationInterface
     {
         if (! isset($arguments[0])) {
             $arguments[0] = 'default';
@@ -118,11 +121,11 @@ public static function __callStatic(string $name, array $arguments)
             $arguments[1] = [];
         }
 
-        if (! is_string($arguments[0])) {
+        if (! \is_string($arguments[0])) {
             throw new \InvalidArgumentException('Argument 1 should be a string or null');
         }
 
-        if (! is_array($arguments[1])) {
+        if (! \is_array($arguments[1])) {
             throw new \InvalidArgumentException('Argument 2 should be an array or null');
         }
 
@@ -136,12 +139,12 @@ public static function create()
     {
         $builder = NotifireBuilder::create();
 
-        if (class_exists('Swift_Mailer')) {
+        if (\class_exists('Swift_Mailer')) {
             $transport = new \Swift_SmtpTransport('localhost', 25);
             $mailer = new \Swift_Mailer($transport);
 
             $handler = new SwiftMailerHandler($mailer, 'default');
-            if (class_exists('Twig_Environment')) {
+            if (\class_exists('Twig_Environment')) {
                 $env = new \Twig_Environment(new \Twig_Loader_Filesystem());
                 $handler->setTwig($env);
             }

diff --git a/lib/Result/ResultSet.php b/lib/Result/ResultSet.php
@@ -32,7 +32,7 @@ public function addResult(Result $result): self
     public function all(): array
     {
         $results = [];
-        array_walk_recursive($this->results, function ($v) use (&$results) {
+        \array_walk_recursive($this->results, function ($v) use (&$results) {
             $results[] = $v;
         });
 

diff --git a/lib/Util/Email/AddressParser.php b/lib/Util/Email/AddressParser.php
@@ -26,14 +26,14 @@ public static function parse(string $address)
             $regex = '/(?<address>'.$addrSpec.')|(?:(?<name>'.$phrase.')(?:'.$cfws.'?)<(?<addressalt>'.$addrSpec.')>(?:'.$cfws.'?))/';
         }
 
-        if (! preg_match($regex, $address, $match)) {
+        if (! \preg_match($regex, $address, $match)) {
             return null;
         }
 
         $addr = isset($match['addressalt']) ? $match['addressalt'] : $match['address'];
 
         $name = $match['name'] ?? '';
-        $name = trim($name, " \t\n\r\0\x0B\"");
+        $name = \trim($name, " \t\n\r\0\x0B\"");
 
         return [
             'address' => $addr,

diff --git a/lib/Util/Email/Grammar.php b/lib/Util/Email/Grammar.php
@@ -48,7 +48,7 @@ public static function getInstance(): self
      */
     public function getDefinition(string $name): string
     {
-        if (array_key_exists($name, self::$_grammar)) {
+        if (\array_key_exists($name, self::$_grammar)) {
             return self::$_grammar[$name];
         }
 
@@ -86,16 +86,16 @@ public function getSpecials(): array
      */
     public function escapeSpecials(string $token, array $include = [], array $exclude = []): string
     {
-        foreach (array_merge(['\\'], array_diff(self::$_specials, $exclude), $include) as $char) {
-            $token = str_replace($char, '\\'.$char, $token);
+        foreach (\array_merge(['\\'], \array_diff(self::$_specials, $exclude), $include) as $char) {
+            $token = \str_replace($char, '\\'.$char, $token);
         }
 
         return $token;
     }
 
     protected function init()
     {
-        if (count(self::$_specials) > 0) {
+        if (\count(self::$_specials) > 0) {
             return;
         }
 

diff --git a/tests/EventListener/TwigProcessorTest.php b/tests/EventListener/TwigProcessorTest.php
@@ -42,7 +42,7 @@ public function testShouldRenderTwigParts()
 
         $this->processor->onPreNotify(new PreNotifyEvent($email));
 
-        $this->assertEquals('This is the body', $email->getPart('text/html')->getContent());
+        self::assertEquals('This is the body', $email->getPart('text/html')->getContent());
     }
 
     public function testShouldAlsoSetSubjectIfTemplateHasBlockSubject()
@@ -56,7 +56,7 @@ public function testShouldAlsoSetSubjectIfTemplateHasBlockSubject()
 
         $this->processor->onPreNotify(new PreNotifyEvent($email));
 
-        $this->assertEquals('This is the body', $email->getPart('text/html')->getContent());
-        $this->assertEquals('This is the subject', $email->getSubject());
+        self::assertEquals('This is the body', $email->getPart('text/html')->getContent());
+        self::assertEquals('This is the subject', $email->getSubject());
     }
 }