Merge branch 'colonel' into test

# Conflicts:
#	vendor/composer/installed.json

application/services/marketing/ColonelService.php

@@ -159,8 +159,11 @@ class ColonelService
         try {
             ColonelDistributorColonelApply::beginTransaction();
             // 修改申请状态
-            $updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus],
-                ['colonel_apply_id' => $applyId, 'audit_status' => [ColonelDistributorColonelApply::STATUS_AUDIT,ColonelDistributorColonelApply::STATUS_REJECT]]
+            $updateStatus = ColonelDistributorColonelApply::updateRecord([
+                'audit_status' => $auditStatus,
+                'update_time'  => date('Y-m-d H:i:s')
+            ],
+                ['colonel_apply_id' => $applyId, 'audit_status[!]' => ColonelDistributorColonelApply::STATUS_PASS]
             );
             if (empty($updateStatus)) {
                 throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);

vendor/composer/ClassLoader.php

@@ -338,7 +338,7 @@ class ClassLoader
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
+     * @return bool|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -347,8 +347,6 @@ class ClassLoader
 
             return true;
         }
-
-        return null;
     }
 
     /**

vendor/symfony/property-info/CHANGELOG.md

@@ -10,7 +10,7 @@ CHANGELOG
 5.2.0
 -----
 
- * deprecated the `enable_magic_call_extraction` context option in `ReflectionExtractor::getWriteInfo()` and `ReflectionExtractor::getReadInfo()`. in favor of `enable_magic_methods_extraction`
+ * deprecated the `enable_magic_call_extraction` context option in `ReflectionExtractor::getWriteInfo()` and `ReflectionExtractor::getReadInfo()` in favor of `enable_magic_methods_extraction`
 
 5.1.0
 -----

vendor/symfony/property-info/Extractor/ReflectionExtractor.php

@@ -552,8 +552,8 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
         $types = [];
         $nullable = $reflectionType->allowsNull();
 
-        foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
-            $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
+        foreach (($reflectionType instanceof \ReflectionUnionType || $reflectionType instanceof \ReflectionIntersectionType) ? $reflectionType->getTypes() : [$reflectionType] as $type) {
+            $phpTypeOrClass = $type->getName();
             if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
                 continue;
             }