Merge branch 'master' into feature/optimize

common/service/exchange/factory/ZhaobiBuilder.php

@@ -253,10 +253,10 @@ class ZhaobiBuilder extends FactoryService
                     $code = $this->code;
                     goto doEnd;
                 }
-                $low = number_format(1 / $low_currency * $low_base_currency, 6, '.', '');
-                $high = number_format(1 / $high_currency * $high_base_currency, 6, '.', '');
-                $close = number_format(1 / $close_currency * $close_base_currency, 6, '.', '');
-                $open = number_format(1 / $open_currency * $open_base_currency, 6, '.', '');
+                $low = number_format(1 / ($low_currency * $low_base_currency), 6, '.', '');
+                $high = number_format(1 / ($high_currency * $high_base_currency), 6, '.', '');
+                $close = number_format(1 / ($close_currency * $close_base_currency), 6, '.', '');
+                $open = number_format(1 / ($open_currency * $open_base_currency), 6, '.', '');
                 $ticker = [
                     'low' => $low,
                     'high' => $high,

vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php

@@ -6,5 +6,6 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- */
-eval('?>' . \file_get_contents('php://stdin'));
+
+ * eval('?>' . \file_get_contents('php://stdin'));
+*/
\ No newline at end of file