Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

rector.php

@@ -16,6 +16,7 @@
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
+use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -142,4 +143,5 @@
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
     $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
+    $rectorConfig->rule(SingleInArrayToCompareRector::class);
 };

system/Config/BaseService.php

@@ -348,7 +348,7 @@ protected static function discoverServices(string $name, array $arguments)
                         continue;
                     }
 
-                    if (! in_array($classname, [Services::class], true)) {
+                    if ($classname !== Services::class) {
                         static::$services[] = new $classname();
                     }
                 }

system/Exceptions/FrameworkException.php

@@ -66,7 +66,7 @@ public static function forMissingExtension(string $extension)
                 'The framework needs the following extension(s) installed and loaded: %s.',
                 $extension
             );
-            // @codeCoverageIgnoreEnd
+        // @codeCoverageIgnoreEnd
         } else {
             $message = lang('Core.missingExtension', [$extension]);
         }

tests/system/Database/Live/GroupTest.php

@@ -40,7 +40,7 @@ public function testGroupBy(): void
 
     public function testHavingBy(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -63,7 +63,7 @@ public function testHavingBy(): void
 
     public function testOrHavingBy(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('user')
@@ -134,7 +134,7 @@ public function testHavingNotIn(): void
 
     public function testOrHavingNotIn(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -207,7 +207,7 @@ public function testOrHavingLike(): void
 
     public function testOrNotHavingLike(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -237,7 +237,7 @@ public function testOrNotHavingLike(): void
 
     public function testAndHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -271,7 +271,7 @@ public function testAndHavingGroupStart(): void
 
     public function testOrHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -306,7 +306,7 @@ public function testOrHavingGroupStart(): void
 
     public function testNotHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')
@@ -340,7 +340,7 @@ public function testNotHavingGroupStart(): void
 
     public function testOrNotHavingGroupStart(): void
     {
-        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+        $isANSISQL = $this->db->DBDriver === 'OCI8';
 
         if ($isANSISQL) {
             $result = $this->db->table('job')