Skip to content

Commit

Permalink
Updated Rector to commit 4b0a688b8117689c243adc1c8dd18e9512673428
Browse files Browse the repository at this point in the history 
rectorphp/rector-src@4b0a688 [TypeDeclaration] skip variadic constructor param of mixed type on AddParamTypeFromPropertyTypeRector (#4887)
  • Loading branch information
@TomasVotruba
TomasVotruba committed Aug 31, 2023
1 parent 25e5fba commit a3ea837
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 37 deletions.
3 changes: 3 additions & 0 deletions rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public function refactor(Node $node) : ?ClassMethod
if ($param->type instanceof Node) {
continue;
}
if ($param->variadic) {
continue;
}
if (!$this->paramTypeAddGuard->isLegal($param, $node)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'cf69407e2ff3402abb8a939d79f326f59121b2b4';
public const PACKAGE_VERSION = '4b0a688b8117689c243adc1c8dd18e9512673428';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-31 10:38:28';
public const RELEASE_DATE = '2023-08-31 17:33:27';
/**
* @var int
*/
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

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

return ComposerAutoloaderInite46103f18a52fefd2d73731998ce322c::getLoader();
return ComposerAutoloaderInitb695178ea6eb4506085e29dc276a6901::getLoader();
10 changes: 5 additions & 5 deletions vendor/composer/autoload_real.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInite46103f18a52fefd2d73731998ce322c
class ComposerAutoloaderInitb695178ea6eb4506085e29dc276a6901
{
private static $loader;

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

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

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

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

$filesToLoad = \Composer\Autoload\ComposerStaticInite46103f18a52fefd2d73731998ce322c::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitb695178ea6eb4506085e29dc276a6901::$files;
$requireFile = \Closure::bind(static function ($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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

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

}, null, ClassLoader::class);
}
Expand Down
16 changes: 8 additions & 8 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,17 @@
},
{
"name": "composer\/semver",
"version": "3.3.2",
"version_normalized": "3.3.2.0",
"version": "3.4.0",
"version_normalized": "3.4.0.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/composer\/semver.git",
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
"reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/composer\/semver\/zipball\/3953f23262f2bff1919fc82183ad9acb13ff62c9",
"reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
"url": "https:\/\/api.github.com\/repos\/composer\/semver\/zipball\/35e8d0af4486141bc745f23a29cc2091eb624a32",
"reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
"shasum": ""
},
"require": {
Expand All @@ -163,7 +163,7 @@
"phpstan\/phpstan": "^1.4",
"symfony\/phpunit-bridge": "^4.2 || ^5"
},
"time": "2022-04-01T19:23:25+00:00",
"time": "2023-08-31T09:50:34+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -205,9 +205,9 @@
"versioning"
],
"support": {
"irc": "irc:\/\/irc.freenode.org\/composer",
"irc": "ircs:\/\/irc.libera.chat:6697\/composer",
"issues": "https:\/\/github.com\/composer\/semver\/issues",
"source": "https:\/\/github.com\/composer\/semver\/tree\/3.3.2"
"source": "https:\/\/github.com\/composer\/semver\/tree\/3.4.0"
},
"funding": [
{
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/installed.php
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions vendor/composer/semver/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

### [3.4.0] 2023-08-31

* Support larger major version numbers (#149)

### [3.3.2] 2022-04-01

* Fixed handling of non-string values (#134)
Expand Down Expand Up @@ -175,6 +179,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
* Changed: code style using php-cs-fixer.

[3.4.0]: https://github.com/composer/semver/compare/3.3.2...3.4.0
[3.3.2]: https://github.com/composer/semver/compare/3.3.1...3.3.2
[3.3.1]: https://github.com/composer/semver/compare/3.3.0...3.3.1
[3.3.0]: https://github.com/composer/semver/compare/3.2.9...3.3.0
Expand Down
7 changes: 4 additions & 3 deletions vendor/composer/semver/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ Semver (Semantic Versioning) library that offers utilities, version constraint p
Originally written as part of [composer/composer](https://github.com/composer/composer),
now extracted and made available as a stand-alone library.

[![Continuous Integration](https://github.com/composer/semver/workflows/Continuous%20Integration/badge.svg?branch=main)](https://github.com/composer/semver/actions)

[![Continuous Integration](https://github.com/composer/semver/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/composer/semver/actions/workflows/continuous-integration.yml)
[![PHP Lint](https://github.com/composer/semver/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/composer/semver/actions/workflows/lint.yml)
[![PHPStan](https://github.com/composer/semver/actions/workflows/phpstan.yml/badge.svg?branch=main)](https://github.com/composer/semver/actions/workflows/phpstan.yml)

Installation
------------

Install the latest version with:

```bash
$ composer require composer/semver
composer require composer/semver
```


Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/semver/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}
],
"support": {
"irc": "irc:\/\/irc.freenode.org\/composer",
"irc": "ircs:\/\/irc.libera.chat:6697\/composer",
"issues": "https:\/\/github.com\/composer\/semver\/issues"
},
"require": {
Expand Down
11 changes: 11 additions & 0 deletions vendor/composer/semver/phpstan-baseline.neon
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
parameters:
ignoreErrors:
-
message: "#^Parameter \\#1 \\$operator of class Composer\\\\Semver\\\\Constraint\\\\Constraint constructor expects '\\!\\='\\|'\\<'\\|'\\<\\='\\|'\\<\\>'\\|'\\='\\|'\\=\\='\\|'\\>'\\|'\\>\\=', non\\-falsy\\-string given\\.$#"
count: 1
path: src/VersionParser.php

-
message: "#^Strict comparison using \\=\\=\\= between null and non\\-empty\\-string will always evaluate to false\\.$#"
count: 2
path: src/VersionParser.php
24 changes: 12 additions & 12 deletions vendor/composer/semver/src/VersionParser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ public function normalize($version, $fullVersion = null)
$version = $match[1];
}
// match classical versioning
if (\preg_match('{^v?(\\d{1,5})(\\.\\d++)?(\\.\\d++)?(\\.\\d++)?' . self::$modifierRegex . '$}i', $version, $matches)) {
if (\preg_match('{^v?(\\d{1,5}+)(\\.\\d++)?(\\.\\d++)?(\\.\\d++)?' . self::$modifierRegex . '$}i', $version, $matches)) {
$version = $matches[1] . (!empty($matches[2]) ? $matches[2] : '.0') . (!empty($matches[3]) ? $matches[3] : '.0') . (!empty($matches[4]) ? $matches[4] : '.0');
$index = 5;
// match date(time) based versioning
} elseif (\preg_match('{^v?(\\d{4}(?:[.:-]?\\d{2}){1,6}(?:[.:-]?\\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) {
$version = \preg_replace('{\\D}', '.', $matches[1]);
} elseif (\preg_match('{^v?(\\d{4}(?:[.:-]?\\d{2}){1,6}(?:[.:-]?\\d{1,3}){0,2})' . self::$modifierRegex . '$}i', $version, $matches)) {
$version = (string) \preg_replace('{\\D}', '.', $matches[1]);
$index = 2;
}
// add version modifiers if a version was matched
Expand Down Expand Up @@ -222,16 +222,16 @@ public function parseConstraints($constraints)
throw new \RuntimeException('Failed to preg_split string: ' . $constraints);
}
$orGroups = array();
foreach ($orConstraints as $constraints) {
$andConstraints = \preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
foreach ($orConstraints as $orConstraint) {
$andConstraints = \preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $orConstraint);
if (\false === $andConstraints) {
throw new \RuntimeException('Failed to preg_split string: ' . $constraints);
throw new \RuntimeException('Failed to preg_split string: ' . $orConstraint);
}
if (\count($andConstraints) > 1) {
$constraintObjects = array();
foreach ($andConstraints as $constraint) {
foreach ($this->parseConstraint($constraint) as $parsedConstraint) {
$constraintObjects[] = $parsedConstraint;
foreach ($andConstraints as $andConstraint) {
foreach ($this->parseConstraint($andConstraint) as $parsedAndConstraint) {
$constraintObjects[] = $parsedAndConstraint;
}
}
} else {
Expand All @@ -244,9 +244,9 @@ public function parseConstraints($constraints)
}
$orGroups[] = $constraint;
}
$constraint = MultiConstraint::create($orGroups, \false);
$constraint->setPrettyString($prettyConstraint);
return $constraint;
$parsedConstraint = MultiConstraint::create($orGroups, \false);
$parsedConstraint->setPrettyString($prettyConstraint);
return $parsedConstraint;
}
/**
* @param string $constraint
Expand Down

0 comments on commit a3ea837

Please sign in to comment.