فهرست منبع

update laravel framework from 5.5 to 5.6

admin 7 سال پیش
والد
کامیت
293501332c
4فایلهای تغییر یافته به همراه294 افزوده شده و 225 حذف شده
  1. 3 3
      app/Http/Controllers/AdminController.php
  2. 4 3
      composer.json
  3. 285 217
      composer.lock
  4. 2 2
      readme.md

+ 3 - 3
app/Http/Controllers/AdminController.php

@@ -587,7 +587,7 @@ class AdminController extends Controller
             DB::beginTransaction();
             try {
                 $ssNode = new SsNode();
-                $ssNode->type = $request->get('type');
+                $ssNode->type = intval($request->get('type'));
                 $ssNode->name = $request->get('name');
                 $ssNode->group_id = $request->get('group_id') ? intval($request->get('group_id')) : 0;
                 $ssNode->country_code = $request->get('country_code') ? $request->get('country_code') : 'un';
@@ -608,7 +608,7 @@ class AdminController extends Controller
                 $ssNode->is_nat = intval($request->get('is_nat'));
                 $ssNode->ssh_port = $request->get('ssh_port') ? intval($request->get('ssh_port')) : 22;
                 $ssNode->is_tcp_check = intval($request->get('is_tcp_check'));
-                $ssNode->compatible = intval($request->get('compatible'));
+                $ssNode->compatible = intval($request->get('type')) == 2 ? 0 : (intval($request->get('is_nat')) ? 0 : intval($request->get('compatible')));
                 $ssNode->single = intval($request->get('single'));
                 $ssNode->single_force = intval($request->get('single')) ? intval($request->get('single_force')) : 0;
                 $ssNode->single_port = intval($request->get('single')) ? ($request->get('single_port') ? $request->get('single_port') : 443) : '';
@@ -725,7 +725,7 @@ class AdminController extends Controller
                     'is_nat'          => intval($request->get('is_nat')),
                     'ssh_port'        => intval($request->get('ssh_port')),
                     'is_tcp_check'    => intval($request->get('is_tcp_check')),
-                    'compatible'      => intval($request->get('compatible')),
+                    'compatible'      => intval($request->get('type')) == 2 ? 0 : (intval($request->get('is_nat')) ? 0 : intval($request->get('compatible'))),
                     'single'          => intval($request->get('single')),
                     'single_force'    => intval($request->get('single')) ? intval($request->get('single_force')) : 0,
                     'single_port'     => intval($request->get('single')) ? ($request->get('single_port') ? $request->get('single_port') : 443) : '',

+ 4 - 3
composer.json

@@ -5,13 +5,14 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.1.3",
         "barryvdh/laravel-ide-helper": "^2.4",
+        "fideloper/proxy": "~4.0",
         "guzzlehttp/guzzle": "^6.3",
         "ipip/db": "^0.6.0",
         "itbdw/ip-database": "^2.0",
         "jenssegers/agent": "^2.5",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.6.*",
         "laravel/tinker": "~1.0",
         "mews/captcha": "^2.1",
         "mews/purifier": "^2.0",
@@ -27,7 +28,7 @@
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "~7.0"
     },
     "autoload": {
         "files": [

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 285 - 217
composer.lock


+ 2 - 2
readme.md

@@ -17,11 +17,11 @@ Support ShadowsocksR、ShadowsocksRR、V2Ray
 [VPS Recommend](https://github.com/ssrpanel/SSRPanel/wiki/VPS%E6%8E%A8%E8%8D%90&%E8%B4%AD%E4%B9%B0%E7%BB%8F%E9%AA%8C)
 
 ## Requirements
-- PHP 7.1 +
+- PHP 7.1.3 +
 - Mysql 5.5 +
 - Memory 1G + 
 - Disk 10G +
-- PHP's components: zip、xml、curl、gd2、fileinfo、openssl、mbstring
+- PHP Extensions: ZIP、XML、CURL、GD2、FileInfo、OpenSSL、Mbstring、PDO、Tokenizer、Ctype、JSON、BCMath 
 
 ## Thanks
 - [@shadowsocks](https://github.com/shadowsocks)

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است