优化格式

Author: flc1125

.php_cs

@@ -0,0 +1,21 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        'array_syntax' => array('syntax' => 'short'),
+        'ordered_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'php_unit_construct' => true,
+        'php_unit_strict' => true,
+        'yoda_style' => false,
+        'phpdoc_summary' => false,
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('vendor')
+            ->in(__DIR__)
+    )
+;

.php_cs.cache

@@ -0,0 +1 @@
+{"php":"7.0.4","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_closure":true},"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":{"singleLine":true},"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"tags":["method","param","property","return","throws","type","var"]},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":true,"no_useless_else":true,"no_useless_return":true,"php_unit_construct":true,"php_unit_strict":true},"hashes":{"src\/Middleware\/CacheResponse.php":3530502477}}

src/Middleware/CacheResponse.php

@@ -2,24 +2,25 @@
 
 namespace Flc\Laravel\Http\Middleware;
 
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+use Cache;
 use Carbon\Carbon;
 use Closure;
-use Cache;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 /**
  * Response缓存中间件
  *
  * @author Flc <2018-03-29 09:14:48>
- * @link http://flc.ren | http://flc.io
+ *
+ * @see http://flc.ren | http://flc.io
  */
 class CacheResponse
 {
     /**
      * 缓存命中状态，1为命中，0为未命中
      *
-     * @var integer
+     * @var int
      */
     protected $cache_hit = 1;
 
@@ -38,10 +39,11 @@ class CacheResponse
     protected $cache_expire_at;
 
     /**
-     * Handle an incoming request.
+     * Handle an incoming request
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next, $minutes = null)
@@ -56,9 +58,10 @@ public function handle($request, Closure $next, $minutes = null)
     /**
      * 返回Response-Cache
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  Closure $next
-     * @param  int|null $minutes
+     * @param \Illuminate\Http\Request $request
+     * @param Closure                  $next
+     * @param int|null                 $minutes
+     *
      * @return array
      */
     protected function getResponseCache($request, $next, $minutes)
@@ -74,7 +77,7 @@ function () use ($request, $next, $resolveMinutes) {
                 $response = $next($request);
 
                 return $this->resolveResponseCache($response) + [
-                    'cacheExpireAt' => Carbon::now()->addMinutes($resolveMinutes)->format('Y-m-d\TH:i:s')
+                    'cacheExpireAt' => Carbon::now()->addMinutes($resolveMinutes)->format('Y-m-d\TH:i:s'),
                 ];
             }
         );
@@ -87,13 +90,14 @@ function () use ($request, $next, $resolveMinutes) {
     /**
      * 确定需要缓存Response的数据
      *
-     * @param  \Illuminate\Http\Response $response
+     * @param \Illuminate\Http\Response $response
+     *
      * @return array
      */
     protected function resolveResponseCache($response)
     {
         return [
-            'content' => $response->getContent()
+            'content' => $response->getContent(),
         ];
     }
 
@@ -119,8 +123,8 @@ protected function addHeaders($response)
     protected function getHeaders()
     {
         $headers = [
-            'X-Cache'          => $this->cache_hit ? 'Hit' : 'Missed',
-            'X-Cache-Key'      => $this->cache_key,
+            'X-Cache' => $this->cache_hit ? 'Hit' : 'Missed',
+            'X-Cache-Key' => $this->cache_key,
             'X-Cache-ExpireAt' => $this->cache_expire_at,
         ];
 
@@ -130,7 +134,8 @@ protected function getHeaders()
     /**
      * 根据请求获取指定的Key
      *
-     * @param  Illuminate\Http\Request $request
+     * @param Illuminate\Http\Request $request
+     *
      * @return string
      */
     protected function resolveRequestKey(Request $request)
@@ -141,7 +146,8 @@ protected function resolveRequestKey(Request $request)
     /**
      * 获取缓存的分钟
      *
-     * @param  int|null $minutes
+     * @param int|null $minutes
+     *
      * @return int
      */
     protected function resolveMinutes($minutes = null)
@@ -154,7 +160,7 @@ protected function resolveMinutes($minutes = null)
     /**
      * 返回默认的缓存时间（分钟）
      *
-     * @return int 
+     * @return int
      */
     protected function getDefaultMinutes()
     {