Kaynağa Gözat

Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

LiuJ 5 ay önce
ebeveyn
işleme
c6903b71c5

+ 132 - 95
app/JsonRpc/NewsService.php

@@ -1180,6 +1180,11 @@ class NewsService implements NewsServiceInterface
     if (empty($result)) {
       return Result::error("暂无此新闻!", 0);
     }
+    if(!empty($result['publiced_at']))
+    {
+        $result['updated_at'] = $result['publiced_at'];
+    }
+
     $category = WebsiteCategory::leftJoin('website', 'website.id', '=', 'website_category.website_id')
       ->select('website_category.*', 'website.website_name', 'website.suffix')
       ->where('website_category.website_id', $data['website_id'])
@@ -2236,9 +2241,9 @@ class NewsService implements NewsServiceInterface
       'status' => 2,
       'website_id' => $data['website_id'],
     ];
-    if ((empty($data['catid']) || !isset($data['catid'])) && (empty($data['keyword']) || !isset($data['keyword'])) && (empty($data['city_id']) || !isset($data['city_id']))) {
-      return Result::error("查询失败", 0);
-    }
+    // if ((empty($data['catid']) || !isset($data['catid'])) && (empty($data['keyword']) || !isset($data['keyword'])) && (empty($data['city_id']) || !isset($data['city_id']))) {
+    //   return Result::error("查询失败", 0);
+    // }
     if ((empty($data['catid']) || !isset($data['catid'])) && (!empty($data['city_id']) || isset($data['city_id']))) {
       $category = WebsiteCategory::where('website_id', $data['website_id'])->where('pid', $data['id'])->orderBy('sort')->first(['category_id']);
       $data['catid'] = $category->category_id ??  0;
@@ -3086,34 +3091,41 @@ class NewsService implements NewsServiceInterface
         $JobRecruiting = $this->processJob($JobRecruiting, $website_id);
       }
     }
-    if ((isset($data['type']) && $data['type'] == 2) || !isset($data['type'])) {
-      if (isset($data['zw_id']) && !empty($data['zw_id'])) {
-        array_push($hunt_where, ['job', $data['zw_id']]);
+    if((isset($data['type']) && $data['type'] == 2) || !isset($data['type'])){
+      if(isset($data['zw_id']) && !empty($data['zw_id'])){
+          array_push($hunt_where, ['job_hunting.job',$data['zw_id']]);
       }
-      if (isset($data['jtzw_id']) && !empty($data['jtzw_id'])) {
-        array_push($hunt_where, ['job_name_get', $data['jtzw_id']]);
+      if(isset($data['jtzw_id']) &&!empty($data['jtzw_id'])){
+          array_push($hunt_where, ['job_hunting.job_name_get',$data['jtzw_id']]);
       }
-      if (isset($data['hy_id']) && !empty($data['hy_id'])) {
-        array_push($hunt_where, ['industry', $data['hy_id']]);
+      if(isset($data['hy_id']) && !empty($data['hy_id'])){
+          array_push($hunt_where, ['job_hunting.industry',$data['hy_id']]);
       }
-      $query = JobHunting::where('status', 2)
-        ->where('job_hunting.website_id', $data['website_id'])
-        ->where($hunt_where)
-        ->when(isset($data['keyword']) && !empty($data['keyword']), function ($query) use ($data) {
-          $query->where('job_position.zwname', 'like', '%' . $data['keyword'] . '%');
-        })
-        ->when(isset($data['city_id']) && !empty($data['city_id']), function ($query) use ($data) {
-          $query->where(function ($q) use ($data) {
-            $q->WhereRaw("JSON_CONTAINS(job_hunting.city_arr_id, '" . intval($data['city_id']) . "') = 1");
+      if(isset($data['keyword']) && !empty($data['keyword'])){ 
+          array_push($hunt_where, ['job_position.zwname','like','%'.$data['keyword'].'%']); 
+
+      } 
+      $query = JobHunting::where('job_hunting.status', 2)
+      ->where('job_hunting.website_id', $data['website_id'])
+      ->leftJoin('job_position', 'job_hunting.job_name_get', '=', 'job_position.zwid')
+      ->where($hunt_where) 
+      // ->when(isset($data['keyword']) &&!empty($data['keyword']), function ($query) use ($data) { 
+      //     $query->where('job_position.zwname','like','%'.$data['keyword'].'%'); 
+      // }) 
+      ->when(isset($data['city_id']) &&!empty($data['city_id']), function ($query) use ($data) {
+          $query->where(function($q) use ($data) {
+              $q->WhereRaw("JSON_CONTAINS(job_hunting.city_arr_id, '". intval($data['city_id']). "') = 1");
           });
-        })
-        ->when(isset($data['catid_id']) && !empty($data['catid_id']), function ($query) use ($data) {
-          $query->where(function ($q) use ($data) {
-            $q->WhereRaw("JSON_CONTAINS(job_hunting.cat_arr_id, '" . intval($data['catid_id']) . "') = 1");
+      })
+      ->when(isset($data['catid_id']) &&!empty($data['catid_id']), function ($query) use ($data) {
+          $query->where(function($q) use ($data) {
+              $q->WhereRaw("JSON_CONTAINS(job_hunting.cat_arr_id, '". intval($data['catid_id']). "') = 1");
           });
-        })
-        ->select('id', 'sexy', 'experience', 'origin', 'industry', 'name', 'job', 'job_name_get', 'city_arr_id', 'cat_arr_id', 'created_at', 'updated_at')
-        ->orderBy('updated_at', 'desc');
+      })
+      ->select('job_hunting.id','job_hunting.sexy','job_hunting.experience','job_hunting.origin','job_hunting.industry',
+      'job_hunting.name','job_hunting.job','job_hunting.job_name_get','job_hunting.city_arr_id','job_hunting.cat_arr_id',
+      'job_hunting.created_at','job_hunting.updated_at','job_position.zwname as job_name')
+      ->orderBy('job_hunting.updated_at', 'desc');
       $hunt_count = $query->count();
       $query = clone $query;
       $JobHunting = $query
@@ -3452,17 +3464,29 @@ class NewsService implements NewsServiceInterface
     }
     if (isset($data['other_route']) && !empty($data['other_route'])) {
       $whiteRouterInfo = WhiteRouter::whereJsonContains("website_id", $data['website_id'])->where('router_url', $data['other_route'])->first();
+      // 验证路由是否存在
+      if (empty($whiteRouterInfo)) {
+            $whiteRouterInfo = WhiteRouter::where("router_type", 1)->where('router_url', $data['other_route'])->first();
+      }
       if (!empty($whiteRouterInfo)) {
-        return Result::success($whiteRouterInfo->toArray());
+            return Result::success($whiteRouterInfo->toArray());
       }
     }
     // 验证栏目路由
     $last_category = WebsiteCategory::where('website_id', $data['website_id'])
       ->where('aLIas_pinyin', $data['last_route'])
-      ->first();
-    if (empty($last_category)) {
+      ->get()->all();
+    if (count($last_category) == 0) {
       return Result::error("该栏目不存在", 0);
     }
+    if(count($last_category) > 1){
+      return Result::error("该子级栏目存在多个,路由验证失败!", 0);
+    }
+    if(count($last_category) == 1){
+      $last_category = $last_category[0];
+    }
+
+    // return Result::success($last_category);
     if (isset($data['id']) && !empty($data['id'])) {
       //   `type` int unsigned DEFAULT '1' COMMENT '类型:1资讯(默认)2商品3书刊音像4招聘5求职类型:1资讯(默认)2商品3书刊音像4招聘5求职6招工招聘'
       switch ($last_category['type']) {
@@ -3551,27 +3575,32 @@ class NewsService implements NewsServiceInterface
           return Result::error("该数据不存在", 0);
           break;
       }
-      $catid = json_decode($article['cat_arr_id'], true);
+      $catid =0 ;
+      $catidArray = json_decode($article['cat_arr_id'], true);
+      $catid = !empty($catidArray) ? end($catidArray) : null;
+    //    return Result::success($article['cat_arr_id']);
       if (empty($catid)) {
         return Result::error("该数据不存在", 0);
       }
+      
       $pinyin = WebsiteCategory::where('website_id', $data['website_id'])
-        ->orderByRaw('FIELD(category_id, ' . implode(',', $catid) . ')')
-        ->whereIn('category_id', $catid)
-        ->pluck('aLIas_pinyin')
-        ->implode('/');
-    }
-    if ($last_category['pid'] != 0) {
-      $cat_arr = json_decode($last_category['category_arr_id'], true);
-      $pinyin = WebsiteCategory::where('website_id', $data['website_id'])
-        ->orderByRaw('FIELD(category_id, ' . implode(',', $cat_arr) . ')')
-        ->whereIn('category_id', $cat_arr)
-        ->pluck('aLIas_pinyin')
-        ->implode('/');
-    } else {
-      $pinyin = $last_category['aLIas_pinyin'];
+        ->where('category_id',$catid)
+        ->select('path')
+        ->pluck('path');
+    }else{
+        if ($last_category['pid'] != 0) {
+            $cat_arr = json_decode($last_category['category_arr_id'], true);
+            $catid = !empty($cat_arr) ? end($cat_arr) : null;
+            $pinyin = WebsiteCategory::where('website_id', $data['website_id'])
+                ->where('category_id',$catid)
+                ->where('path',$data['all_route'])
+                ->pluck('path');
+        } else {
+            $pinyin[0] = $last_category['aLIas_pinyin'];
+        }
     }
-    if (empty($pinyin) || $pinyin != $data['all_route']) {
+    // return Result::success($pinyin[0]);
+    if (empty($pinyin) || count($pinyin)>1 || $pinyin[0] != $data['all_route']) {
       return Result::error('非法路径!');
     } else {
       return Result::success($pinyin);
@@ -6262,57 +6291,58 @@ class NewsService implements NewsServiceInterface
    * @return array
    */
   public function getCompanyList(array $data): array
-  {
-    // return Result::success($data);
-    $where = [];
-    $user = User::where('id', $data['user_id'])->first();
-    if (empty($user)) {
-      return Result::error('用户不存在!');
-    }
-    if ($user['type_id'] != 10000) {
-      $where['user_id'] = $data['user_id'];
-    }
-    if (isset($data['title']) && !empty($data['title'])) {
-      array_push($where, ['company.title', 'like', '%' . $data['title'] . '%']);
-    }
-    if (isset($data['website_id']) && !empty($data['website_id'])) {
-      array_push($where, ['website.id', $data['website_id']]);
-    }
-    if (isset($data['ischeck']) && !empty($data['ischeck'])) {
-      if ($data['ischeck'] == 1) {
-        if (isset($data['status']) && $data['status'] != '') {
-          array_push($where, ['company.status', $data['status']]);
-          $query = Company::where($where);
-        } else {
-          $query =  Company::whereIn('company.status', [0, 2]);
+    {
+      // return Result::success($data);
+        $where = [];
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error('用户不存在!');
         }
-      } else {
-        $query =  Company::where('company.status', 1);
-      }
-    }
-    $result = $query->where($where)
-      ->leftJoin('website_category', function ($query) {
-        $query->on('website_category.category_id', '=', 'company.category_id')
-          ->on('website_category.website_id', '=', 'company.website_id');
-      })
-      ->leftJoin('website', 'company.website_id', '=', 'website.id')
-      ->select(
-        'company.id',
-        'company.title',
-        'company.website_id',
-        'company.category_id',
-        'website.website_name',
-        'website_category.alias as category_name',
-        'company.status',
-        'company.updated_at',
-      )
-      ->orderBy('company.updated_at', 'desc')
-      ->paginate($data['pageSize'], ['*'], 'page', $data['page']);
+        if($user['type_id']!= 10000){
+            $where['user_id'] = $data['user_id'];
+        }
+        if(isset($data['title']) && !empty($data['title'])){
+          array_push($where, ['company.title', 'like', '%'. $data['title']. '%']);
+        }
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+          array_push($where, ['website.id', $data['website_id']]);
+        }
+        if(isset($data['ischeck']) && !empty($data['ischeck'])){
+          if($data['ischeck'] == 1){
+              if(isset($data['status']) && $data['status'] != ''){
+                array_push($where, ['company.status', $data['status']]);
+                $query = Company::where($where);
+              }else{
+                $query =  Company::whereIn('company.status', [0,2]);
+              }
+          }else{
+              $query =  Company::where('company.status', 1);
+          }
+        }
+        $result = $query->where($where)
+        ->leftJoin('website_category', function ($query) {
+            $query->on('website_category.category_id', '=', 'company.category_id')
+                ->on('website_category.website_id', '=', 'company.website_id');        
+        })
+        ->leftJoin('website', 'company.website_id', '=', 'website.id')
+        ->select(
+          'company.id', 
+          'company.title', 
+          'company.website_id', 
+          'company.category_id', 
+          'website.website_name', 
+          'website_category.alias as category_name',
+          'company.status',
+          'company.updated_at',
+          'company.user_id'
+        )
+        ->orderBy('company.updated_at', 'desc')
+        ->paginate($data['pageSize'], ['*'], 'page', $data['page']);
 
-    if ($result->isEmpty()) {
-      return Result::error("暂无企业", 0);
-    }
-    return Result::success($result);
+      if($result->isEmpty()){
+          return Result::error("暂无企业", 0);
+      }
+        return Result::success($result);
   }
   /**
    * 添加企业
@@ -6540,6 +6570,11 @@ class NewsService implements NewsServiceInterface
   public function getCompanyInfo(array $data): array
   {
     $result = Company::where('id', $data['id'])->first();
+    $city_arr = json_decode($result['city_arr_id']);
+     $result['city_name'] = District::whereIn('id', $city_arr)
+        ->pluck('name')
+        ->implode('-');
+
     if (empty($result)) {
       return Result::error('企业不存在!');
     } else {
@@ -6742,7 +6777,9 @@ class NewsService implements NewsServiceInterface
         'project.updated_at',
         'project.status',
         'website.website_name',
-        'website_category.alias as category_name'
+        'website_category.alias as category_name',
+        'project.website_id',
+        'project.user_id'
       )
       ->orderBy('project.updated_at', 'desc')
       ->offset(($data['page'] - 1) * $data['pageSize'])

+ 9 - 0
vendor/composer/autoload_classmap.php

@@ -367,6 +367,7 @@ return array(
     'Fidry\\CpuCoreCounter\\Finder\\CpuCoreFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/CpuCoreFinder.php',
     'Fidry\\CpuCoreCounter\\Finder\\CpuInfoFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/CpuInfoFinder.php',
     'Fidry\\CpuCoreCounter\\Finder\\DummyCpuCoreFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/DummyCpuCoreFinder.php',
+    'Fidry\\CpuCoreCounter\\Finder\\EnvVariableFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/EnvVariableFinder.php',
     'Fidry\\CpuCoreCounter\\Finder\\FinderRegistry' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/FinderRegistry.php',
     'Fidry\\CpuCoreCounter\\Finder\\HwLogicalFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/HwLogicalFinder.php',
     'Fidry\\CpuCoreCounter\\Finder\\HwPhysicalFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/HwPhysicalFinder.php',
@@ -384,6 +385,7 @@ return array(
     'Fidry\\CpuCoreCounter\\Finder\\WmicPhysicalFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/WmicPhysicalFinder.php',
     'Fidry\\CpuCoreCounter\\Finder\\_NProcessorFinder' => $vendorDir . '/fidry/cpu-core-counter/src/Finder/_NProcessorFinder.php',
     'Fidry\\CpuCoreCounter\\NumberOfCpuCoreNotFound' => $vendorDir . '/fidry/cpu-core-counter/src/NumberOfCpuCoreNotFound.php',
+    'Fidry\\CpuCoreCounter\\ParallelisationResult' => $vendorDir . '/fidry/cpu-core-counter/src/ParallelisationResult.php',
     'Fig\\Http\\Message\\RequestMethodInterface' => $vendorDir . '/fig/http-message-util/src/RequestMethodInterface.php',
     'Fig\\Http\\Message\\StatusCodeInterface' => $vendorDir . '/fig/http-message-util/src/StatusCodeInterface.php',
     'Fukuball\\Jieba\\Finalseg' => $vendorDir . '/fukuball/jieba-php/src/class/Finalseg.php',
@@ -3560,6 +3562,7 @@ return array(
     'PhpCsFixer\\Fixer\\ArrayNotation\\WhitespaceAfterCommaInArrayFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixer.php',
     'PhpCsFixer\\Fixer\\ArrayNotation\\YieldFromArrayToYieldsFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/YieldFromArrayToYieldsFixer.php',
     'PhpCsFixer\\Fixer\\AttributeNotation\\AttributeEmptyParenthesesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/AttributeEmptyParenthesesFixer.php',
+    'PhpCsFixer\\Fixer\\AttributeNotation\\GeneralAttributeRemoveFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/GeneralAttributeRemoveFixer.php',
     'PhpCsFixer\\Fixer\\AttributeNotation\\OrderedAttributesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/OrderedAttributesFixer.php',
     'PhpCsFixer\\Fixer\\Basic\\BracesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesFixer.php',
     'PhpCsFixer\\Fixer\\Basic\\BracesPositionFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesPositionFixer.php',
@@ -3734,6 +3737,7 @@ return array(
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAssertNewNamesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAssertNewNamesFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAttributesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAttributesFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitConstructFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitConstructFixer.php',
+    'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderMethodOrderFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderMethodOrderFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderNameFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderNameFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderReturnTypeFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderStaticFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderStaticFixer.php',
@@ -3833,6 +3837,7 @@ return array(
     'PhpCsFixer\\Fixer\\Whitespace\\TypeDeclarationSpacesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Whitespace/TypeDeclarationSpacesFixer.php',
     'PhpCsFixer\\Fixer\\Whitespace\\TypesSpacesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Whitespace/TypesSpacesFixer.php',
     'PhpCsFixer\\Fixer\\WhitespacesAwareFixerInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/WhitespacesAwareFixerInterface.php',
+    'PhpCsFixer\\Hasher' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Hasher.php',
     'PhpCsFixer\\Indicator\\PhpUnitTestCaseIndicator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Indicator/PhpUnitTestCaseIndicator.php',
     'PhpCsFixer\\Linter\\CachingLinter' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Linter/CachingLinter.php',
     'PhpCsFixer\\Linter\\Linter' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Linter/Linter.php',
@@ -3878,6 +3883,7 @@ return array(
     'PhpCsFixer\\RuleSet\\Sets\\PHP80MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP80MigrationRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHP80MigrationSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP80MigrationSet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHP81MigrationSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP81MigrationSet.php',
+    'PhpCsFixer\\RuleSet\\Sets\\PHP82MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP82MigrationRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHP82MigrationSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP82MigrationSet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHP83MigrationSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP83MigrationSet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHP84MigrationSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP84MigrationSet.php',
@@ -3905,6 +3911,8 @@ return array(
     'PhpCsFixer\\RuleSet\\Sets\\PhpCsFixerSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PhpCsFixerSet.php',
     'PhpCsFixer\\RuleSet\\Sets\\SymfonyRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonyRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\SymfonySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonySet.php',
+    'PhpCsFixer\\Runner\\Event\\AnalysisStarted' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Event/AnalysisStarted.php',
+    'PhpCsFixer\\Runner\\Event\\FileProcessed' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Event/FileProcessed.php',
     'PhpCsFixer\\Runner\\FileCachingLintingFileIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/FileCachingLintingFileIterator.php',
     'PhpCsFixer\\Runner\\FileFilterIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/FileFilterIterator.php',
     'PhpCsFixer\\Runner\\LintingFileIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/LintingFileIterator.php',
@@ -3944,6 +3952,7 @@ return array(
     'PhpCsFixer\\Tokenizer\\Analyzer\\CommentsAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/CommentsAnalyzer.php',
     'PhpCsFixer\\Tokenizer\\Analyzer\\ControlCaseStructuresAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/ControlCaseStructuresAnalyzer.php',
     'PhpCsFixer\\Tokenizer\\Analyzer\\DataProviderAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/DataProviderAnalyzer.php',
+    'PhpCsFixer\\Tokenizer\\Analyzer\\FullyQualifiedNameAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/FullyQualifiedNameAnalyzer.php',
     'PhpCsFixer\\Tokenizer\\Analyzer\\FunctionsAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/FunctionsAnalyzer.php',
     'PhpCsFixer\\Tokenizer\\Analyzer\\GotoLabelAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/GotoLabelAnalyzer.php',
     'PhpCsFixer\\Tokenizer\\Analyzer\\NamespaceUsesAnalyzer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/NamespaceUsesAnalyzer.php',

+ 9 - 0
vendor/composer/autoload_static.php

@@ -1142,6 +1142,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'Fidry\\CpuCoreCounter\\Finder\\CpuCoreFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/CpuCoreFinder.php',
         'Fidry\\CpuCoreCounter\\Finder\\CpuInfoFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/CpuInfoFinder.php',
         'Fidry\\CpuCoreCounter\\Finder\\DummyCpuCoreFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/DummyCpuCoreFinder.php',
+        'Fidry\\CpuCoreCounter\\Finder\\EnvVariableFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/EnvVariableFinder.php',
         'Fidry\\CpuCoreCounter\\Finder\\FinderRegistry' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/FinderRegistry.php',
         'Fidry\\CpuCoreCounter\\Finder\\HwLogicalFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/HwLogicalFinder.php',
         'Fidry\\CpuCoreCounter\\Finder\\HwPhysicalFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/HwPhysicalFinder.php',
@@ -1159,6 +1160,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'Fidry\\CpuCoreCounter\\Finder\\WmicPhysicalFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/WmicPhysicalFinder.php',
         'Fidry\\CpuCoreCounter\\Finder\\_NProcessorFinder' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/Finder/_NProcessorFinder.php',
         'Fidry\\CpuCoreCounter\\NumberOfCpuCoreNotFound' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/NumberOfCpuCoreNotFound.php',
+        'Fidry\\CpuCoreCounter\\ParallelisationResult' => __DIR__ . '/..' . '/fidry/cpu-core-counter/src/ParallelisationResult.php',
         'Fig\\Http\\Message\\RequestMethodInterface' => __DIR__ . '/..' . '/fig/http-message-util/src/RequestMethodInterface.php',
         'Fig\\Http\\Message\\StatusCodeInterface' => __DIR__ . '/..' . '/fig/http-message-util/src/StatusCodeInterface.php',
         'Fukuball\\Jieba\\Finalseg' => __DIR__ . '/..' . '/fukuball/jieba-php/src/class/Finalseg.php',
@@ -4335,6 +4337,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\Fixer\\ArrayNotation\\WhitespaceAfterCommaInArrayFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixer.php',
         'PhpCsFixer\\Fixer\\ArrayNotation\\YieldFromArrayToYieldsFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/YieldFromArrayToYieldsFixer.php',
         'PhpCsFixer\\Fixer\\AttributeNotation\\AttributeEmptyParenthesesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/AttributeEmptyParenthesesFixer.php',
+        'PhpCsFixer\\Fixer\\AttributeNotation\\GeneralAttributeRemoveFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/GeneralAttributeRemoveFixer.php',
         'PhpCsFixer\\Fixer\\AttributeNotation\\OrderedAttributesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/OrderedAttributesFixer.php',
         'PhpCsFixer\\Fixer\\Basic\\BracesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesFixer.php',
         'PhpCsFixer\\Fixer\\Basic\\BracesPositionFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesPositionFixer.php',
@@ -4509,6 +4512,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAssertNewNamesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAssertNewNamesFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAttributesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAttributesFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitConstructFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitConstructFixer.php',
+        'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderMethodOrderFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderMethodOrderFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderNameFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderNameFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderReturnTypeFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderStaticFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderStaticFixer.php',
@@ -4608,6 +4612,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\Fixer\\Whitespace\\TypeDeclarationSpacesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Whitespace/TypeDeclarationSpacesFixer.php',
         'PhpCsFixer\\Fixer\\Whitespace\\TypesSpacesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Whitespace/TypesSpacesFixer.php',
         'PhpCsFixer\\Fixer\\WhitespacesAwareFixerInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/WhitespacesAwareFixerInterface.php',
+        'PhpCsFixer\\Hasher' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Hasher.php',
         'PhpCsFixer\\Indicator\\PhpUnitTestCaseIndicator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Indicator/PhpUnitTestCaseIndicator.php',
         'PhpCsFixer\\Linter\\CachingLinter' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Linter/CachingLinter.php',
         'PhpCsFixer\\Linter\\Linter' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Linter/Linter.php',
@@ -4653,6 +4658,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\RuleSet\\Sets\\PHP80MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP80MigrationRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHP80MigrationSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP80MigrationSet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHP81MigrationSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP81MigrationSet.php',
+        'PhpCsFixer\\RuleSet\\Sets\\PHP82MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP82MigrationRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHP82MigrationSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP82MigrationSet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHP83MigrationSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP83MigrationSet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHP84MigrationSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHP84MigrationSet.php',
@@ -4680,6 +4686,8 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\RuleSet\\Sets\\PhpCsFixerSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PhpCsFixerSet.php',
         'PhpCsFixer\\RuleSet\\Sets\\SymfonyRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonyRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\SymfonySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonySet.php',
+        'PhpCsFixer\\Runner\\Event\\AnalysisStarted' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Event/AnalysisStarted.php',
+        'PhpCsFixer\\Runner\\Event\\FileProcessed' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Event/FileProcessed.php',
         'PhpCsFixer\\Runner\\FileCachingLintingFileIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/FileCachingLintingFileIterator.php',
         'PhpCsFixer\\Runner\\FileFilterIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/FileFilterIterator.php',
         'PhpCsFixer\\Runner\\LintingFileIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/LintingFileIterator.php',
@@ -4719,6 +4727,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'PhpCsFixer\\Tokenizer\\Analyzer\\CommentsAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/CommentsAnalyzer.php',
         'PhpCsFixer\\Tokenizer\\Analyzer\\ControlCaseStructuresAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/ControlCaseStructuresAnalyzer.php',
         'PhpCsFixer\\Tokenizer\\Analyzer\\DataProviderAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/DataProviderAnalyzer.php',
+        'PhpCsFixer\\Tokenizer\\Analyzer\\FullyQualifiedNameAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/FullyQualifiedNameAnalyzer.php',
         'PhpCsFixer\\Tokenizer\\Analyzer\\FunctionsAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/FunctionsAnalyzer.php',
         'PhpCsFixer\\Tokenizer\\Analyzer\\GotoLabelAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/GotoLabelAnalyzer.php',
         'PhpCsFixer\\Tokenizer\\Analyzer\\NamespaceUsesAnalyzer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/Analyzer/NamespaceUsesAnalyzer.php',