Improve class validation.

liufind · Mar 22, 2019 · 639d1cd · 639d1cd
1 parent 322dd21
commit 639d1cd
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/src/EasySms.php b/src/EasySms.php
@@ -126,15 +126,15 @@ public function gateway($name = null)
      */
     public function strategy($strategy = null)
     {
-        if (is_null($strategy)) {
+        if (\is_null($strategy)) {
             $strategy = $this->config->get('default.strategy', OrderStrategy::class);
         }
 
-        if (!class_exists($strategy)) {
-            $strategy = __NAMESPACE__.'\Strategies\\'.ucfirst($strategy);
+        if (!\class_exists($strategy)) {
+            $strategy = __NAMESPACE__.'\Strategies\\'.\ucfirst($strategy);
         }
 
-        if (!class_exists($strategy)) {
+        if (!\class_exists($strategy)) {
             throw new InvalidArgumentException("Unsupported strategy \"{$strategy}\"");
         }
 
@@ -227,7 +227,7 @@ protected function createGateway($name)
         }
 
         if (!($gateway instanceof GatewayInterface)) {
-            throw new InvalidArgumentException(sprintf('Gateway "%s" not inherited from %s.', $name, GatewayInterface::class));
+            throw new InvalidArgumentException(\sprintf('Gateway "%s" must be inherit from %s.', $name, GatewayInterface::class));
         }
 
         return $gateway;
@@ -245,8 +245,8 @@ protected function createGateway($name)
      */
     protected function makeGateway($gateway, $config)
     {
-        if (!class_exists($gateway)) {
-            throw new InvalidArgumentException(sprintf('Gateway "%s" not exists.', $gateway));
+        if (!\class_exists($gateway) || !\in_array(GatewayInterface::class, \class_implements($gateway))) {
+            throw new InvalidArgumentException(\sprintf('Class "%s" is a invalid easy-sms gateway.', $gateway));
         }
 
         return new $gateway($config);
@@ -261,11 +261,11 @@ protected function makeGateway($gateway, $config)
      */
     protected function formatGatewayClassName($name)
     {
-        if (class_exists($name)) {
+        if (\class_exists($name)) {
             return $name;
         }
 
-        $name = ucfirst(str_replace(['-', '_', ''], '', $name));
+        $name = \ucfirst(\str_replace(['-', '_', ''], '', $name));
 
         return __NAMESPACE__."\\Gateways\\{$name}Gateway";
     }
@@ -279,7 +279,7 @@ protected function formatGatewayClassName($name)
      */
     protected function callCustomCreator($gateway)
     {
-        return call_user_func($this->customCreators[$gateway], $this->config->get("gateways.{$gateway}", []));
+        return \call_user_func($this->customCreators[$gateway], $this->config->get("gateways.{$gateway}", []));
     }
 
     /**
@@ -293,7 +293,7 @@ protected function formatPhoneNumber($number)
             return $number;
         }
 
-        return new PhoneNumber(trim($number));
+        return new PhoneNumber(\trim($number));
     }
 
     /**
@@ -304,7 +304,7 @@ protected function formatPhoneNumber($number)
     protected function formatMessage($message)
     {
         if (!($message instanceof MessageInterface)) {
-            if (!is_array($message)) {
+            if (!\is_array($message)) {
                 $message = [
                     'content' => $message,
                     'template' => $message,
@@ -329,16 +329,16 @@ protected function formatGateways(array $gateways)
         $formatted = [];
 
         foreach ($gateways as $gateway => $setting) {
-            if (is_int($gateway) && is_string($setting)) {
+            if (\is_int($gateway) && \is_string($setting)) {
                 $gateway = $setting;
                 $setting = [];
             }
 
             $formatted[$gateway] = $setting;
             $globalSettings = $this->config->get("gateways.{$gateway}", []);
 
-            if (is_string($gateway) && !empty($globalSettings) && is_array($setting)) {
-                $formatted[$gateway] = new Config(array_merge($globalSettings, $setting));
+            if (\is_string($gateway) && !empty($globalSettings) && \is_array($setting)) {
+                $formatted[$gateway] = new Config(\array_merge($globalSettings, $setting));
             }
         }
 

diff --git a/src/Gateways/AliyunrestGateway.php b/src/Gateways/AliyunrestGateway.php
@@ -67,7 +67,7 @@ public function send(PhoneNumberInterface $to, MessageInterface $message, Config
 
         $result = $this->post($this->getEndpointUrl($urlParams), $params);
 
-        if (isset($result['error_response']) && $result['error_response']['code'] != 0) {
+        if (isset($result['error_response']) && 0 != $result['error_response']['code']) {
             throw new GatewayErrorException($result['error_response']['msg'], $result['error_response']['code'], $result);
         }
 

diff --git a/src/PhoneNumber.php b/src/PhoneNumber.php
@@ -83,7 +83,7 @@ public function getZeroPrefixedNumber()
     /**
      * @param string $prefix
      *
-     * @return null|string
+     * @return string|null
      */
     public function getPrefixedIDDCode($prefix)
     {

diff --git a/tests/EasySmsTest.php b/tests/EasySmsTest.php
@@ -32,11 +32,19 @@ public function testGateway()
 
         // invalid gateway
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Gateway "Overtrue\EasySms\Gateways\NotExistsGatewayNameGateway" not exists.');
+        $this->expectExceptionMessage('Class "Overtrue\EasySms\Gateways\NotExistsGatewayNameGateway" is a invalid easy-sms gateway.');
 
         $easySms->gateway('NotExistsGatewayName');
     }
 
+    public function testGatewayNameConflicts()
+    {
+        $easySms = \Mockery::mock(EasySms::class.'[makeGateway]', [['default' => DummyGatewayForTest::class]]);
+
+        $this->expectExceptionMessage('Class "Overtrue\EasySms\Tests\DummyGatewayNotImplementsGatewayInterface" is a invalid easy-sms gateway.');
+        $easySms->makeGateway(DummyGatewayNotImplementsGatewayInterface::class, []);
+    }
+
     public function testGatewayWithoutDefaultSetting()
     {
         $easySms = new EasySms([]);
@@ -58,9 +66,8 @@ public function testGatewayWithDefaultSetting()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
             sprintf(
-                'Gateway "%s" not inherited from %s.',
-                DummyInvalidGatewayForTest::class,
-                GatewayInterface::class
+                'Class "%s" is a invalid easy-sms gateway.',
+                DummyInvalidGatewayForTest::class
             )
         );
         $easySms->gateway();
@@ -181,6 +188,10 @@ public function testFormatGateways()
     }
 }
 
+class DummyGatewayNotImplementsGatewayInterface
+{
+}
+
 class DummyGatewayForTest implements GatewayInterface
 {
     public function getName()

diff --git a/tests/Traits/HasHttpRequestTest.php b/tests/Traits/HasHttpRequestTest.php
@@ -13,8 +13,8 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use Overtrue\EasySms\Traits\HasHttpRequest;
 use Overtrue\EasySms\Tests\TestCase;
+use Overtrue\EasySms\Traits\HasHttpRequest;
 use Psr\Http\Message\ResponseInterface;
 
 class HasHttpRequestTest extends TestCase