Merge pull request #9232 from samsonasik/refactor-enable-rector-code-…

…quality-level-14

refactor: enable rector code quality level 14

rector.php

@@ -23,9 +23,7 @@
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
-use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
 use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
-use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
@@ -189,14 +187,12 @@
         ChangeNestedForeachIfsToEarlyContinueRector::class,
         ChangeIfElseValueAssignToEarlyReturnRector::class,
         CombineIfRector::class,
-        SimplifyIfReturnBoolRector::class,
         InlineIfToExplicitIfRector::class,
         PreparedValueToEarlyReturnRector::class,
         ShortenElseIfRector::class,
         SimplifyIfElseToTernaryRector::class,
         UnusedForeachValueToArrayKeysRector::class,
         ChangeArrayPushToArrayAssignRector::class,
-        UnnecessaryTernaryExpressionRector::class,
         RemoveErrorSuppressInTryCatchStmtsRector::class,
         FuncGetArgsToVariadicParamRector::class,
         MakeInheritedMethodVisibilitySameAsParentRector::class,
@@ -220,4 +216,4 @@
         // keep '\\' prefix string on string '\Foo\Bar'
         StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
     ])
-    ->withCodeQualityLevel(9);
+    ->withCodeQualityLevel(14);

system/Config/Services.php

@@ -230,7 +230,7 @@ public static function email($config = null, bool $getShared = true)
             return static::getSharedInstance('email', $config);
         }
 
-        if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig)) {
+        if (empty($config) || (! is_array($config) && ! $config instanceof EmailConfig)) {
             $config = config(EmailConfig::class);
         }
 

system/Images/Handlers/ImageMagickHandler.php

@@ -42,7 +42,7 @@ public function __construct($config = null)
     {
         parent::__construct($config);
 
-        if (! (extension_loaded('imagick') || class_exists(Imagick::class))) {
+        if (! extension_loaded('imagick') && ! class_exists(Imagick::class)) {
             throw ImageException::forMissingExtension('IMAGICK'); // @codeCoverageIgnore
         }