Skip to content

Commit

Permalink
Updated Rector to commit ee222b28938a1debe2849c45660097eb1d6eeb5f
Browse files Browse the repository at this point in the history
rectorphp/rector-src@ee222b2 Assert JoinColumns in CPP should be converted (#2991)
  • Loading branch information
TomasVotruba committed Oct 15, 2022
1 parent ee8ab57 commit 4f7e013
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

use PhpParser\Node;
use PhpParser\Node\AttributeGroup;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
Expand Down Expand Up @@ -99,10 +100,10 @@ class SomeEntity
*/
public function getNodeTypes() : array
{
return [Property::class, Class_::class];
return [Property::class, Class_::class, Param::class];
}
/**
* @param Property|Class_ $node
* @param Property|Class_|Param $node
*/
public function refactor(Node $node) : ?Node
{
Expand Down
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f4f758c7431f66bc97a019eb53055d05c15705c6';
public const PACKAGE_VERSION = 'ee222b28938a1debe2849c45660097eb1d6eeb5f';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-10-15 21:33:59';
public const RELEASE_DATE = '2022-10-15 22:29:36';
/**
* @var int
*/
Expand Down
8 changes: 8 additions & 0 deletions src/PhpParser/Printer/BetterStandardPrinter.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use PhpParser\Node\Expr\Yield_;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar\DNumber;
use PhpParser\Node\Scalar\EncapsedStringPart;
use PhpParser\Node\Scalar\LNumber;
Expand Down Expand Up @@ -397,6 +398,13 @@ protected function pScalar_LNumber(LNumber $lNumber)
}
return parent::pScalar_LNumber($lNumber);
}
/**
* Keep attributes on newlines
*/
protected function pParam(Param $param) : string
{
return $this->pAttrGroups($param->attrGroups) . $this->pModifiers($param->flags) . ($param->type instanceof Node ? $this->p($param->type) . ' ' : '') . ($param->byRef ? '&' : '') . ($param->variadic ? '...' : '') . $this->p($param->var) . ($param->default instanceof Expr ? ' = ' . $this->p($param->default) : '');
}
/**
* @param \PhpParser\Node\Scalar\LNumber|\PhpParser\Node\Scalar\DNumber $lNumber
*/
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInited76a38418d21b5da5d2d31d91b77c37::getLoader();
return ComposerAutoloaderInitb30d8f3f285ad0114aa98e01d10cebbc::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInited76a38418d21b5da5d2d31d91b77c37
class ComposerAutoloaderInitb30d8f3f285ad0114aa98e01d10cebbc
{
private static $loader;

Expand All @@ -22,19 +22,19 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInited76a38418d21b5da5d2d31d91b77c37', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb30d8f3f285ad0114aa98e01d10cebbc', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInited76a38418d21b5da5d2d31d91b77c37', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb30d8f3f285ad0114aa98e01d10cebbc', 'loadClassLoader'));

require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInited76a38418d21b5da5d2d31d91b77c37::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc::getInitializer($loader));

$loader->setClassMapAuthoritative(true);
$loader->register(true);

$includeFiles = \Composer\Autoload\ComposerStaticInited76a38418d21b5da5d2d31d91b77c37::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireed76a38418d21b5da5d2d31d91b77c37($fileIdentifier, $file);
composerRequireb30d8f3f285ad0114aa98e01d10cebbc($fileIdentifier, $file);
}

return $loader;
Expand All @@ -46,7 +46,7 @@ public static function getLoader()
* @param string $file
* @return void
*/
function composerRequireed76a38418d21b5da5d2d31d91b77c37($fileIdentifier, $file)
function composerRequireb30d8f3f285ad0114aa98e01d10cebbc($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInited76a38418d21b5da5d2d31d91b77c37
class ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
Expand Down Expand Up @@ -3093,9 +3093,9 @@ class ComposerStaticInited76a38418d21b5da5d2d31d91b77c37
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInited76a38418d21b5da5d2d31d91b77c37::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInited76a38418d21b5da5d2d31d91b77c37::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInited76a38418d21b5da5d2d31d91b77c37::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb30d8f3f285ad0114aa98e01d10cebbc::$classMap;

}, null, ClassLoader::class);
}
Expand Down

0 comments on commit 4f7e013

Please sign in to comment.