Updated Rector to commit fff22320cedf04f5aa2449592f1924bc5ebc5551

TomasVotruba · TomasVotruba · commit ef3f017e7b21 · 2023-04-20T13:44:42.000Z
rectorphp/rector-src@fff2232 Simplify AccessoryNonEmptyStringTypeCorrector (#3636)
diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php
@@ -17,7 +17,7 @@ public function correct(Type $mainType)
         if (!$mainType instanceof IntersectionType) {
             return $mainType;
         }
-        if (!$mainType->isSubTypeOf(new AccessoryNonEmptyStringType())->yes() && !$mainType->isSubTypeOf(new AccessoryNonFalsyStringType())->yes()) {
+        if (!$mainType->isNonEmptyString()->yes()) {
             return $mainType;
         }
         $clearIntersectionedTypes = [];
diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php
@@ -32,7 +32,6 @@ public function correct(Type $mainType) : Type
             if (!$this->reflectionProvider->hasClass($value)) {
                 return $traverseCallback($traversedType);
             }
-            /** @var ClassReflection $classReflection */
             $classReflection = $this->reflectionProvider->getClass($value);
             if ($classReflection->getName() !== $value) {
                 return $traverseCallback($traversedType);
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'ff899747379670edd250e653764e51ae592aac16';
+    public const PACKAGE_VERSION = 'fff22320cedf04f5aa2449592f1924bc5ebc5551';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-04-20 19:09:48';
+    public const RELEASE_DATE = '2023-04-20 15:40:46';
     /**
      * @var int
      */
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit7fdd0497b8f3ce2c45f758868691c9c9::getLoader();
+return ComposerAutoloaderInit286fbee27242ec4de65ee68511a8ff46::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit7fdd0497b8f3ce2c45f758868691c9c9
+class ComposerAutoloaderInit286fbee27242ec4de65ee68511a8ff46
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit7fdd0497b8f3ce2c45f758868691c9c9', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit286fbee27242ec4de65ee68511a8ff46', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit7fdd0497b8f3ce2c45f758868691c9c9', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit286fbee27242ec4de65ee68511a8ff46', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9
+class ComposerStaticInit286fbee27242ec4de65ee68511a8ff46
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3149,9 +3149,9 @@ class ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$classMap;
 
         }, null, ClassLoader::class);
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function correct(Type $mainType)`
`17`	`17`	`if (!$mainType instanceof IntersectionType) {`
`18`	`18`	`return $mainType;`
`19`	`19`	`}`
`20`		`- if (!$mainType->isSubTypeOf(new AccessoryNonEmptyStringType())->yes() && !$mainType->isSubTypeOf(new AccessoryNonFalsyStringType())->yes()) {`
	`20`	`+ if (!$mainType->isNonEmptyString()->yes()) {`
`21`	`21`	`return $mainType;`
`22`	`22`	`}`
`23`	`23`	`$clearIntersectionedTypes = [];`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public function correct(Type $mainType) : Type`
`32`	`32`	`if (!$this->reflectionProvider->hasClass($value)) {`
`33`	`33`	`return $traverseCallback($traversedType);`
`34`	`34`	`}`
`35`		`- /** @var ClassReflection $classReflection */`
`36`	`35`	`$classReflection = $this->reflectionProvider->getClass($value);`
`37`	`36`	`if ($classReflection->getName() !== $value) {`
`38`	`37`	`return $traverseCallback($traversedType);`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`
`23`	`23`	`require_once __DIR__ . '/composer/autoload_real.php';`
`24`	`24`
`25`		`-return ComposerAutoloaderInit7fdd0497b8f3ce2c45f758868691c9c9::getLoader();`
	`25`	`+return ComposerAutoloaderInit286fbee27242ec4de65ee68511a8ff46::getLoader();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Composer\Autoload;`
`6`	`6`
`7`		`-class ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9`
	`7`	`+class ComposerStaticInit286fbee27242ec4de65ee68511a8ff46`
`8`	`8`	`{`
`9`	`9`	`public static $files = array (`
`10`	`10`	`'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',`
`@@ -3149,9 +3149,9 @@ class ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9`
`3149`	`3149`	`public static function getInitializer(ClassLoader $loader)`
`3150`	`3150`	`{`
`3151`	`3151`	`return \Closure::bind(function () use ($loader) {`
`3152`		`- $loader->prefixLengthsPsr4 = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$prefixLengthsPsr4;`
`3153`		`- $loader->prefixDirsPsr4 = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$prefixDirsPsr4;`
`3154`		`- $loader->classMap = ComposerStaticInit7fdd0497b8f3ce2c45f758868691c9c9::$classMap;`
	`3152`	`+ $loader->prefixLengthsPsr4 = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$prefixLengthsPsr4;`
	`3153`	`+ $loader->prefixDirsPsr4 = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$prefixDirsPsr4;`
	`3154`	`+ $loader->classMap = ComposerStaticInit286fbee27242ec4de65ee68511a8ff46::$classMap;`
`3155`	`3155`
`3156`	`3156`	`}, null, ClassLoader::class);`
`3157`	`3157`	`}`