Develop (#429)

* XML empty node bugfix #426. * Applied fixes from StyleCI (#427) * Auto validate. * Fix server test. * Applied fixes from StyleCI (#428)
w7corp · May 25, 2016 · ab27301 · ab27301
1 parent 62971c7
commit ab27301
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 45 deletions.
diff --git a/src/Foundation/ServiceProviders/ServerServiceProvider.php b/src/Foundation/ServiceProviders/ServerServiceProvider.php
@@ -54,7 +54,7 @@ public function register(Container $pimple)
         };
 
         $pimple['server'] = function ($pimple) {
-            $server = new Guard();
+            $server = new Guard($pimple['config']['token']);
 
             $server->debug($pimple['config']['debug']);
 

diff --git a/src/Server/Guard.php b/src/Server/Guard.php
@@ -54,36 +54,31 @@ class Guard
     const ALL_MSG = 1048830;
 
     /**
-     * Request instance.
-     *
      * @var Request
      */
     protected $request;
 
     /**
-     * Encryptor instance.
-     *
+     * @var string
+     */
+    protected $token;
+
+    /**
      * @var Encryptor
      */
     protected $encryptor;
 
     /**
-     * Message listener.
-     *
      * @var string|callable
      */
     protected $messageHandler;
 
     /**
-     * Message type filter.
-     *
      * @var int
      */
     protected $messageFilter;
 
     /**
-     * Message type mapping.
-     *
      * @var array
      */
     protected $messageTypeMapping = [
@@ -98,19 +93,19 @@ class Guard
     ];
 
     /**
-     * Debug mode.
-     *
      * @var bool
      */
     protected $debug = false;
 
     /**
      * Constructor.
      *
+     * @param string  $token
      * @param Request $request
      */
-    public function __construct(Request $request = null)
+    public function __construct($token, Request $request = null)
     {
+        $this->token = $token;
         $this->request = $request ?: Request::createFromGlobals();
     }
 
@@ -145,6 +140,8 @@ public function serve()
             'Content' => $this->request->getContent(),
         ]);
 
+        $this->validate($this->token);
+
         if ($str = $this->request->get('echostr')) {
             Log::debug("Output 'echostr' is '$str'.");
 

diff --git a/src/Support/File.php b/src/Support/File.php
@@ -79,7 +79,7 @@ class File
      */
     public static function getStreamExt($stream)
     {
-        if (is_file($stream)) {
+        if (is_dir(pathinfo($stream, PATHINFO_DIRNAME)) && is_readable($stream)) {
             $stream = file_get_contents($stream);
         }
 

diff --git a/src/Support/XML.php b/src/Support/XML.php
@@ -20,6 +20,8 @@
  */
 namespace EasyWeChat\Support;
 
+use SimpleXMLElement;
+
 /**
  * Class XML.
  */
@@ -34,13 +36,7 @@ class XML
      */
     public static function parse($xml)
     {
-        $data = simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOBLANKS);
-
-        if (is_object($data) && get_class($data) === 'SimpleXMLElement') {
-            $data = self::arrarval($data);
-        }
-
-        return $data;
+        return self::normalize(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOBLANKS));
     }
 
     /**
@@ -99,19 +95,28 @@ public static function cdata($string)
      *
      * @return array
      */
-    private static function arrarval($data)
+    protected static function normalize($obj)
     {
-        if (is_object($data) && get_class($data) === 'SimpleXMLElement') {
-            $data = (array) $data;
+        $result = null;
+
+        if (is_object($obj)) {
+            $obj = get_object_vars($obj);
         }
 
-        if (is_array($data)) {
-            foreach ($data as $index => $value) {
-                $data[$index] = self::arrarval($value);
+        if (is_array($obj)) {
+            foreach ($obj as $key => $value) {
+                $res = self::normalize($value);
+                if (($key === '@attributes') && ($key)) {
+                    $result = $res;
+                } else {
+                    $result[$key] = $res;
+                }
             }
+        } else {
+            $result = $obj;
         }
 
-        return $data;
+        return $result;
     }
 
     /**
@@ -123,7 +128,7 @@ private static function arrarval($data)
      *
      * @return string
      */
-    private static function data2Xml($data, $item = 'item', $id = 'id')
+    protected static function data2Xml($data, $item = 'item', $id = 'id')
     {
         $xml = $attr = '';
 

diff --git a/tests/Server/ServerGuardTest.php b/tests/Server/ServerGuardTest.php
@@ -17,20 +17,18 @@
 
 class ServerGuardTest extends TestCase
 {
-    public function getServer($message = '', $queries = null)
+    public function getServer($message = '', $queries = [])
     {
-        $request = Mockery::mock(Request::class.'[get,getContent]');
-
-        $request->shouldReceive('get')->andReturnUsing(function ($key) use ($queries) {
-            $queries = $queries ?: [
-                'signature' => '5fe39987c51aa87c0da1af7420d4649d77850391',
-                'timestamp' => '1437865042',
-                'nonce' => '335941714',
-            ];
-
-            return isset($queries[$key]) ? $queries[$key] : null;
-        });
-
+        $token = 'test_token';
+        $nonce = '335941714';
+        $timestamp = '1437865042';
+        $signature = 'd060dbd49d56631d867c5fa8063650d3246bd355';
+
+        $queries = array_merge([
+            'signature' => $signature,
+            'timestamp' => $timestamp,
+            'nonce' => $nonce,
+        ], $queries);
         $message = $message ?: [
                 'ToUserName' => 'gh_9a1a7e312b32',
                 'FromUserName' => 'oNlnUjq_uJdd52zt3OxFsJHEr_NY',
@@ -40,9 +38,9 @@ public function getServer($message = '', $queries = null)
                 'MsgId' => '6175583331658476609',
             ];
 
-        $request->shouldReceive('getContent')->andReturn(XML::build($message));
+        $request = new Request($queries, [], [], [], [], [], XML::build($message));
 
-        $server = new Guard($request);
+        $server = new Guard($token, $request);
 
         return $server;
     }