解决PHPUnit使用及与Docker Compose 调试问题

admin/control/control.php

@@ -178,11 +178,6 @@ class SystemControl
 			foreach ($v['list'] as $key=>$value) {
 				$model_list_parent = '';
 				$args = explode(',',$value['args']);
-				if ($admin_array['admin_is_super'] != 1){
-					if (!@in_array($args[1],$permission)){
-						//continue;
-					}
-				}
 
 				if (!empty($value['parent'])){
 					if (empty($current_parent) || $current_parent != $value['parent']){
@@ -194,7 +189,9 @@ class SystemControl
 				$value['op'] = $args[0];
 				$value['act'] = $args[1];
 				//$tmp_list .= str_ireplace(array('_args_','_text_','_op_'),$value,$model_list);
-				$tmp_list .= str_ireplace(array('_args_','_text_','_opact_','_pkey_'),array($value['args'],$value['text'],$value['op'].$value['act'],$value['parent']),$model_list_parent.$model_list);
+				$tmp_list .= str_ireplace(['_args_','_text_','_opact_','_pkey_'],
+                    [$value['args'],$value['text'],$value['op'],$value['act'],$value['parent']],
+                    $model_list_parent.$model_list);
 			}
 
 			$left_nav = str_replace('list_body',$tmp_list,$left_nav);

admin/index.php

@@ -5,6 +5,7 @@
  *
  * *  */
 
+define('BASE_ROOT_PATH',str_replace('/admin','',dirname(__FILE__)));
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
 if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');

conf/php-fpm/php-debug.ini

@@ -103,7 +103,7 @@
 ;   Development Value: On
 ;   Production Value: Off
 
-; error_reporting
+; member_info
 ;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
 ;   Development Value: E_ALL
 ;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
@@ -457,7 +457,7 @@ memory_limit = 128M
 ; Development Value: E_ALL
 ; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE
 
 ; This directive controls whether or not and where PHP will output errors,
 ; notices and warnings too. Error output is very useful during development, but
@@ -474,7 +474,7 @@ error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-errors
-display_errors = Off
+display_errors = On
 
 ; The display of errors which occur during PHP's startup sequence are handled
 ; separately from display_errors. PHP's default behavior is to suppress those
@@ -1323,9 +1323,8 @@ bcmath.scale = 0
 [Session]
 ; Handler used to store/retrieve data.
 ; http://php.net/session.save-handler
-session.save_handler = file
-;session.save_handler = redis
-;session.save_path = "tcp://host.docker.internal:6379"
+session.save_handler = redis
+session.save_path = "tcp://redisrv:6379"
 
 ;session.save_handler = files
 
@@ -1942,8 +1941,6 @@ ldap.max_links = -1
 
 output_buffering = On
 
-;extension=xdebug.so
-
 [xdebug]
 xdebug.default_enable=1
 xdebug.remote_enable=1

core/framework/db/mysqli.php

@@ -94,7 +94,7 @@ class Db
 
 		//进行编码声明
 		if (!self::$link[$host]->query($query_string)) {
-			throw_exception("Db Error: ".mysqli_error(self::$link[$host]));
+			throw_exception("Db Error: " . mysqli_error(self::$link[$host]));
 		}
 	}
 

data/model/member.model.php

@@ -262,8 +262,8 @@ class memberModel extends Model
     /**
      * 注册商城会员
      *
-     * @param    array $param 会员信息
-     * @return    array 数组格式的返回结果
+     * @param     array $param 会员信息
+     * @return    minxed 数组格式的返回结果
      */
     public function addMember($param)
     {

docker-compose-dev.yml

@@ -7,6 +7,7 @@ services:
       - "80:80"
     volumes:
       - $PWD:/var/www/html
+      - /Volumes/Transcend/upload:/var/www/html/data/upload
       - $PWD/conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
     links:
       - mobilesrv
@@ -31,6 +32,7 @@ services:
     volumes:
       - $PWD:/var/www/html
       - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /Volumes/Transcend/upload:/var/www/html/data/upload
       - $PWD/conf/php/docker-php-spwan-start:/usr/local/bin/docker-php-spwan-start
     links:
       - redisrv
@@ -47,6 +49,7 @@ services:
         - "9000:9000"
       volumes:
         - $PWD:/var/www/html
+        - /Volumes/Transcend/upload:/var/www/html/data/upload
         - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
         - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
         - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
@@ -56,3 +59,15 @@ services:
         - "redisrv"
       #docker run -it -v $PWD:/var/www/html -v $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini -p 9000:9000
       #--name websrv  php-fpm:alpine
+
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD:/var/www/html
+    links:
+      - redisrv
+    container_name: "panda-php"
+    depends_on:
+      - "redisrv"
+      - "fpmsrv"

global.php

@@ -6,7 +6,8 @@
  *
  ***/
 
-error_reporting(E_ALL & ~E_NOTICE);
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting(0);
 @date_default_timezone_set('Asia/Shanghai');
 
 define('InShopNC',true);

helper/login/ilogin.php

@@ -138,7 +138,7 @@ abstract class ILogin
             $update['member_mobile_bind'] = 1;
         }
 
-        $ret = $mod_member->editMember(array('member_id' => $this->mMemberId), $update);
+        $ret = $mod_member->editMember(['member_id' => $this->mMemberId], $update);
         if($ret && $mod_member->affected_rows() > 0)
         {
             if($update['member_mobile_bind'] === 1) {

helper/login/memberid_log.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Created by PhpStorm.
  * User: stanley-king
@@ -12,6 +14,7 @@ class memberid_log extends ILogin
 {
     public function __construct($member_id)
     {
+        parent::__construct();
         $this->mMemberId = $member_id;
         if($this->ismember() == false) {
             throw_exception("错误的会员编号:{$member_id}");

mobile/kdniao_notify.php

@@ -1,6 +1,6 @@
 <?php
 //ini_set("display_errors",1);
-//error_reporting(E_ALL);
+// member_info(E_ALL);
 
 defined('BASE_ROOT_PATH') or define('BASE_ROOT_PATH',str_replace('/mobile','',dirname(__FILE__)));
 require_once(BASE_DATA_PATH . '/logic/delivery.logic.php');

test/TestAccountHelper.php

@@ -1,4 +1,6 @@
-<?php
+<?php declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
 
 /**
  * Created by PhpStorm.
@@ -9,15 +11,17 @@
 
 define('BASE_ROOT_PATH',str_replace('/test','',dirname(__FILE__)));
 
+require_once(BASE_ROOT_PATH . '/global.php');
+require_once(BASE_CORE_PATH . '/lrlz.php');
 require_once(BASE_ROOT_PATH . '/fooder.php');
 require_once(BASE_ROOT_PATH . '/helper/bonus_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/account_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/category_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/brand_helper.php');
 
-class testAccountHelper extends PHPUnit_Framework_TestCase
+class TestAccountHelper extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass() : void
     {
         Base::run_util();
     }
@@ -63,7 +67,7 @@ class testAccountHelper extends PHPUnit_Framework_TestCase
     {
         $mod = Model('order');
         $pay_sn = '910510761110261481';
-        $order_info = $mod->getOrderInfo(array('pay_sn' => $pay_sn));
+        $order_info = $mod->getOrderInfo(['pay_sn' => $pay_sn]);
         $logic_order = Logic('order');
         $result = $logic_order->changeOrderStateReceive($order_info,'system','系统','超期未收货系统自动完成订单');
     }
@@ -71,7 +75,7 @@ class testAccountHelper extends PHPUnit_Framework_TestCase
     public function testUpfile()
     {
         $file = '/Users/stanley-king/work/PHPProject/shopnc/data/upload/uploadtmp/20161215081131-53be4be9-fe01-50e7-28c0-ded900c9a0f6.jpg';
-        $ext = exif_imagetype($file);
+        $ext  = exif_imagetype($file);
         $exif = image_type_to_mime_type($ext);
         $tagnmae = exif_tagname($ext);
 
@@ -87,8 +91,9 @@ class testAccountHelper extends PHPUnit_Framework_TestCase
         account_helper::onAsyncBroadcastOrder('290563492188164623',0.1,30);
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass():void
     {
+
     }
 
 }