Skip to content

Commit 7335dc7

Browse files
spazespaze
committed
Update packages
 - phpstan/phpdoc-parser updated from 1.29.0 to 1.29.1 patch See changes: phpstan/phpdoc-parser@1.29.0...1.29.1 Release notes: https://github.com/phpstan/phpdoc-parser/releases/tag/1.29.1 - phpstan/phpstan updated from 1.11.2 to 1.11.3 patch See changes: phpstan/phpstan@1.11.2...1.11.3 Release notes: https://github.com/phpstan/phpstan/releases/tag/1.11.3 - roave/security-advisories updated from dev-latest@0ec6bad to dev-latest@255803f See changes: Roave/SecurityAdvisories@0ec6bad...255803f - spaze/phpcs-phar updated from 3.10.1 to 3.10.1.1 patch See changes: spaze/phpcs-phar@3.10.1...3.10.1.1 Release notes: https://github.com/spaze/phpcs-phar/releases/tag/3.10.1.1 - symfony/cache updated from v7.0.7 to v7.1.0 minor See changes: symfony/cache@v7.0.7...v7.1.0 Release notes: https://github.com/symfony/cache/releases/tag/v7.1.0 - symfony/config updated from v7.0.7 to v7.1.0 minor See changes: symfony/config@v7.0.7...v7.1.0 Release notes: https://github.com/symfony/config/releases/tag/v7.1.0 - symfony/filesystem updated from v7.0.7 to v7.1.0 minor See changes: symfony/filesystem@v7.0.7...v7.1.0 Release notes: https://github.com/symfony/filesystem/releases/tag/v7.1.0 - symfony/translation updated from v7.0.7 to v7.1.0 minor See changes: symfony/translation@v7.0.7...v7.1.0 Release notes: https://github.com/symfony/translation/releases/tag/v7.1.0 - symfony/var-exporter updated from v7.0.7 to v7.1.0 minor See changes: symfony/var-exporter@v7.0.7...v7.1.0 Release notes: https://github.com/symfony/var-exporter/releases/tag/v7.1.0 - texy/texy updated from v3.2.1 to v3.2.2 patch See changes: dg/texy@v3.2.1...v3.2.2 Release notes: https://github.com/dg/texy/releases/tag/v3.2.2
1 parent c7e4901 commit 7335dc7

File tree

89 files changed

+709
-479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+709
-479
lines changed

‎site/composer.lock

Lines changed: 79 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/vendor/composer/autoload_psr4.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'Spaze\\SubresourceIntegrity\\' => array($vendorDir . '/spaze/sri-macros/src'),
1919
'Spaze\\PhpInfo\\' => array($vendorDir . '/spaze/phpinfo/src'),
2020
'Spaze\\PHPStan\\Rules\\Disallowed\\' => array($vendorDir . '/spaze/phpstan-disallowed-calls/src'),
21+
'Spaze\\PHPCSPhar\\' => array($vendorDir . '/spaze/phpcs-phar/src'),
2122
'Spaze\\NonceGenerator\\' => array($vendorDir . '/spaze/nonce-generator/src'),
2223
'Spaze\\Exports\\' => array($vendorDir . '/spaze/feed-exports/src'),
2324
'Spaze\\Encryption\\' => array($vendorDir . '/spaze/encryption/src'),

‎site/vendor/composer/autoload_static.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b
2828
'Spaze\\SubresourceIntegrity\\' => 27,
2929
'Spaze\\PhpInfo\\' => 14,
3030
'Spaze\\PHPStan\\Rules\\Disallowed\\' => 31,
31+
'Spaze\\PHPCSPhar\\' => 16,
3132
'Spaze\\NonceGenerator\\' => 21,
3233
'Spaze\\Exports\\' => 14,
3334
'Spaze\\Encryption\\' => 17,
@@ -117,6 +118,10 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b
117118
array (
118119
0 => __DIR__ . '/..' . '/spaze/phpstan-disallowed-calls/src',
119120
),
121+
'Spaze\\PHPCSPhar\\' =>
122+
array (
123+
0 => __DIR__ . '/..' . '/spaze/phpcs-phar/src',
124+
),
120125
'Spaze\\NonceGenerator\\' =>
121126
array (
122127
0 => __DIR__ . '/..' . '/spaze/nonce-generator/src',

‎site/vendor/composer/installed.json

Lines changed: 88 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/vendor/composer/installed.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -326,18 +326,18 @@
326326
),
327327
),
328328
'phpstan/phpdoc-parser' => array(
329-
'pretty_version' => '1.29.0',
330-
'version' => '1.29.0.0',
331-
'reference' => '536889f2b340489d328f5ffb7b02bb6b183ddedc',
329+
'pretty_version' => '1.29.1',
330+
'version' => '1.29.1.0',
331+
'reference' => 'fcaefacf2d5c417e928405b71b400d4ce10daaf4',
332332
'type' => 'library',
333333
'install_path' => __DIR__ . '/../phpstan/phpdoc-parser',
334334
'aliases' => array(),
335335
'dev_requirement' => true,
336336
),
337337
'phpstan/phpstan' => array(
338-
'pretty_version' => '1.11.2',
339-
'version' => '1.11.2.0',
340-
'reference' => '0d5d4294a70deb7547db655c47685d680e39cfec',
338+
'pretty_version' => '1.11.3',
339+
'version' => '1.11.3.0',
340+
'reference' => 'e64220a05c1209fc856d58e789c3b7a32c0bb9a5',
341341
'type' => 'library',
342342
'install_path' => __DIR__ . '/../phpstan/phpstan',
343343
'aliases' => array(),
@@ -412,7 +412,7 @@
412412
'roave/security-advisories' => array(
413413
'pretty_version' => 'dev-latest',
414414
'version' => 'dev-latest',
415-
'reference' => '0ec6bad5f4523eda2514e89d5ea48cde6ebe7f99',
415+
'reference' => '255803f702f07bee1a4edb0b079348c198603514',
416416
'type' => 'metapackage',
417417
'install_path' => null,
418418
'aliases' => array(
@@ -502,9 +502,9 @@
502502
'dev_requirement' => false,
503503
),
504504
'spaze/phpcs-phar' => array(
505-
'pretty_version' => '3.10.1',
506-
'version' => '3.10.1.0',
507-
'reference' => 'abeff33a0d955e8de08f67bb996c0a5ef211d343',
505+
'pretty_version' => '3.10.1.1',
506+
'version' => '3.10.1.1',
507+
'reference' => '12cb250f680472045d8136e05b9104cbb904389d',
508508
'type' => 'library',
509509
'install_path' => __DIR__ . '/../spaze/phpcs-phar',
510510
'aliases' => array(),
@@ -562,9 +562,9 @@
562562
),
563563
),
564564
'symfony/cache' => array(
565-
'pretty_version' => 'v7.0.7',
566-
'version' => '7.0.7.0',
567-
'reference' => '48e3508338987d63b0114a00c208c4cbb76e5303',
565+
'pretty_version' => 'v7.1.0',
566+
'version' => '7.1.0.0',
567+
'reference' => 'c36a10e6456b32e40d1ef516b3a2749883f9117b',
568568
'type' => 'library',
569569
'install_path' => __DIR__ . '/../symfony/cache',
570570
'aliases' => array(),
@@ -586,9 +586,9 @@
586586
),
587587
),
588588
'symfony/config' => array(
589-
'pretty_version' => 'v7.0.7',
590-
'version' => '7.0.7.0',
591-
'reference' => 'f66f908a975500aa4594258bf454dc66e3939eac',
589+
'pretty_version' => 'v7.1.0',
590+
'version' => '7.1.0.0',
591+
'reference' => 'c4a60be1c7ec93aa8b7f19e07b6427143a502ef4',
592592
'type' => 'library',
593593
'install_path' => __DIR__ . '/../symfony/config',
594594
'aliases' => array(),
@@ -604,9 +604,9 @@
604604
'dev_requirement' => false,
605605
),
606606
'symfony/filesystem' => array(
607-
'pretty_version' => 'v7.0.7',
608-
'version' => '7.0.7.0',
609-
'reference' => 'cc168be6fbdcdf3401f50ae863ee3818ed4338f5',
607+
'pretty_version' => 'v7.1.0',
608+
'version' => '7.1.0.0',
609+
'reference' => '8ecdde25881598f86cdd7cfe8b25302b66a402e9',
610610
'type' => 'library',
611611
'install_path' => __DIR__ . '/../symfony/filesystem',
612612
'aliases' => array(),
@@ -640,9 +640,9 @@
640640
'dev_requirement' => false,
641641
),
642642
'symfony/translation' => array(
643-
'pretty_version' => 'v7.0.7',
644-
'version' => '7.0.7.0',
645-
'reference' => '1515e03afaa93e6419aba5d5c9d209159317100b',
643+
'pretty_version' => 'v7.1.0',
644+
'version' => '7.1.0.0',
645+
'reference' => '583d18e461eada8270ca44b7d99f07abf1ab048e',
646646
'type' => 'library',
647647
'install_path' => __DIR__ . '/../symfony/translation',
648648
'aliases' => array(),
@@ -664,18 +664,18 @@
664664
),
665665
),
666666
'symfony/var-exporter' => array(
667-
'pretty_version' => 'v7.0.7',
668-
'version' => '7.0.7.0',
669-
'reference' => 'cdecc0022e40e90340ba1a59a3d5ccf069777078',
667+
'pretty_version' => 'v7.1.0',
668+
'version' => '7.1.0.0',
669+
'reference' => '353688d70dcd43e8f7a5cc13b9afba49d4946c39',
670670
'type' => 'library',
671671
'install_path' => __DIR__ . '/../symfony/var-exporter',
672672
'aliases' => array(),
673673
'dev_requirement' => false,
674674
),
675675
'texy/texy' => array(
676-
'pretty_version' => 'v3.2.1',
677-
'version' => '3.2.1.0',
678-
'reference' => '99f4261956fda6fb3a28c1264ff33abce725044b',
676+
'pretty_version' => 'v3.2.2',
677+
'version' => '3.2.2.0',
678+
'reference' => 'cd1068e6abef89808f969347076aaaace9215bd5',
679679
'type' => 'library',
680680
'install_path' => __DIR__ . '/../texy/texy',
681681
'aliases' => array(),

‎site/vendor/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TemplateTagValueNode implements PhpDocTagValueNode
1111

1212
use NodeAttributes;
1313

14-
/** @var string */
14+
/** @var non-empty-string */
1515
public $name;
1616

1717
/** @var TypeNode|null */
@@ -23,6 +23,9 @@ class TemplateTagValueNode implements PhpDocTagValueNode
2323
/** @var string (may be empty) */
2424
public $description;
2525

26+
/**
27+
* @param non-empty-string $name
28+
*/
2629
public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null)
2730
{
2831
$this->name = $name;

‎site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,10 @@ public function parseTemplateTagValue(
510510
$description = '';
511511
}
512512

513+
if ($name === '') {
514+
throw new LogicException('Template tag name cannot be empty.');
515+
}
516+
513517
return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default);
514518
}
515519

‎site/vendor/phpstan/phpstan/phpstan.phar

29.5 KB
Binary file not shown.

‎site/vendor/phpstan/phpstan/phpstan.phar.asc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
-----BEGIN PGP SIGNATURE-----
22

3-
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZQlJ4ACgkQUcZzBf/C
4-
5cDlwBAAj3ya2zqDT/zNrlDojBaTP0dOnCe4/caxUXlGiwjadGLYDiJBSTx01XQx
5-
VayI1rDWh9XZ90Lo9CxP2hG6y3yQ/fBD9Z5QP/Zt/YLG03m91pUVn65do6U0D/ff
6-
SXD8G50j3i763Kysb5MxlJXQ3RZrFh+6teGcNkzkU2rI39XVBdeGN/QJ56kJXsqj
7-
gb4a9FKMF6kkVJ1kWohI4g0iTvJ/Jgu1io5hoA6z39Ly2LH9Rx/HRpqQm6iTZz66
8-
ycBmPZC3K+XmeoIuM6vMeTSJ3qHUzu2MNa8vWQpsXCqnMakwef5Frf+TN6iZcPlr
9-
MTQQdKIjpwSjgzV0KNa/2T8rd/yMBlnjFO88DzBWjUfqlB4U19SrBHQIpl53bAPp
10-
YGMIMoyZYnbp1xqyrJ9jIZbs/AXOZZh4BDxHTyUyBUKSHP1DvB54Vp93n4C8KyM8
11-
+i1p+M2CsUu3+oqxAIl62G2JWLl754nQ9vkMRKG7aPZ51ip8ZoCG88uFelK6NrGj
12-
eeIWnIuLKY+1LONCgFkslzLhDNGnq4ROQ+6tEmdS45MbsWeHpf5NQoJ5xHrSj60I
13-
hI0lZ8GAuwUAwwxqNyDl5uIeuJWNmlbV5hrbesikhPE41kQdoyx5tx8Mu/VJNBdB
14-
67EbAWK9/z5FZMqATiCiYcTIJeEA4Dt4Pd7MFYbNI5jDH0pZ4Es=
15-
=AcMg
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZZ1kYACgkQUcZzBf/C
4+
5cBzjA/5Ab6Ey+9h5ZHEmNsOZD+owcARovpMU/crDFT35kjr5q9I0Z3zlLGHWzI3
5+
dvLRrfwWF2JpA7oGdbrUbtFJ6bClikg/RAzWHSikHsCcFkQ1lorjxJxJaX8K+NW9
6+
P5f0IFEL/pfQQ/5YdoEvH6Ah4BiyV9Yu99V8k3bINJx6dxfAX8tRTNAbFfe+EmU0
7+
/Wpq7xQL3nAyA78jqbiYvi3x/7k7l8FRFpO/cQxjdmCkJZ5nMfZN3WnT4WF/WycC
8+
oP17wWdLno74QNJR9Jt5Sb4SFWvrFNgjYQbjQICxfHPzdczfEKo9CoZxEB+rPJZU
9+
/OD1umIIgT4e5XdgJZb9jBrl/FF2C2VJD1HreoDy6KFIw8ZZdqbwprLVG1IIIfG8
10+
bRhCLZjbscSqQgiay4Lo1SVJv9YOQT8mPtIcKy4LF7rCGhJ2bBqd8Z53j9Gmyktt
11+
ENAQB4cipFiJ3O/YHZ/Pi32yAqouSNKnJ+JSG7AozjyX4Zq06F0u9LSR7GcArlok
12+
pp2J7EU9YMazPC73wrUFn0GD9nr/YUeHu9eYPi9YLfrPxEFJzFQtAziuzyPCgneU
13+
Ce4Fe1BDumB5Lx4c4chqOnD4FH/xp57RPNzKUXrM4pcc3axLjM865I1/MW4+pjnV
14+
/RxGSy5hd+kCPPc5bV84YDY38/ZLGBkgCa7EY5h0RK7sEkNngeg=
15+
=tbKK
1616
-----END PGP SIGNATURE-----

‎site/vendor/spaze/phpcs-phar/CodeSniffer.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎site/vendor/spaze/phpcs-phar/README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# PHP_CodeSniffer phar releases
22

33
[![Create a phar release](https://github.com/spaze/phpcs-phar/actions/workflows/create-release.yml/badge.svg)](https://github.com/spaze/phpcs-phar/actions/workflows/create-release.yml)
4+
[![PHP Tests](https://github.com/spaze/phpcs-phar/actions/workflows/php.yml/badge.svg)](https://github.com/spaze/phpcs-phar/actions/workflows/php.yml)
45

56
This repo contains phar releases of [PHPCSStandards/PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer).
67

@@ -27,24 +28,34 @@ There are several reasons for that:
2728
1. The installer plugin [looks](https://github.com/PHPCSStandards/composer-installer/blob/290bcb677628f4d829f64a4337bf0b9237238f0b/src/Plugin.php#L47) for a different installed package, `squizlabs/php_codesniffer` to add more standards to
2829
2. The plugin creates a configuration file with a relative path to the standard being installed, so the code sniffer then expects the standard to be present inside the phar file, which is not the case
2930

30-
However, there are multiple ways to install the standard manually. Let's say you want to add [`slevomat/coding-standard`](https://github.com/slevomat/coding-standard), you can:
31+
However, there are multiple different ways to install a standard. Let's say you want to add [`slevomat/coding-standard`](https://github.com/slevomat/coding-standard), you can:
32+
33+
### Auto-install the available standards
34+
If the `CodeSniffer.conf` file doesn't exist, this package will find and auto-install all available coding standards on each execution.
35+
The altered configuration is not persisted, no config file will be created, because it would be removed on each package update anyway.
36+
This is the recommended option emulating the Standards Composer Installer Plugin to a certain point.
37+
3138
### Modify the config file
3239
1. In your project, run
3340
```
3441
vendor/bin/phpcs --config-set installed_paths ../../slevomat/coding-standard
3542
```
3643
3. Locate the `CodeSniffer.conf` file in your `vendor/spaze/phpcs-phar` directory
37-
4. Edit the path to the installed standard and make it an absolute path, for example change
44+
4. Edit the path to the installed standard and make it an absolute path, for example change
3845
```php
3946
'installed_paths' => '../../slevomat/coding-standard'
4047
```
4148
to
4249
```php
4350
'installed_paths' => __DIR__ . '/../../slevomat/coding-standard'
4451
```
52+
Please be aware that the `CodeSniffer.conf` file will be removed on each package update.
53+
4554
### Install the standard using an absolute path
4655
In your project, run
4756
```
4857
vendor/bin/phpcs --config-set installed_paths $(realpath vendor/slevomat/coding-standard)
4958
```
5059
or use any absolute path for the `installed_paths` value.
60+
61+
Please be aware that the `CodeSniffer.conf` file will be removed on each package update.

‎site/vendor/spaze/phpcs-phar/composer.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,26 @@
1717
"phpcsstandards/php_codesniffer": "3.10.1",
1818
"squizlabs/php_codesniffer": "3.10.1"
1919
},
20+
"require": {
21+
"composer-runtime-api": "^2.1"
22+
},
23+
"require-dev": {
24+
"php-parallel-lint/php-parallel-lint": "^1.4",
25+
"php-parallel-lint/php-console-highlighter": "^1.0"
26+
},
27+
"autoload": {
28+
"psr-4": {
29+
"Spaze\\PHPCSPhar\\": "src"
30+
}
31+
},
2032
"bin": [
2133
"phpcbf",
2234
"phpcs"
23-
]
35+
],
36+
"scripts": {
37+
"lint": "vendor/bin/parallel-lint --colors phpcs phpcbf",
38+
"test": [
39+
"@lint"
40+
]
41+
}
2442
}

‎site/vendor/spaze/phpcs-phar/phpcbf

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
<?php
33
declare(strict_types = 1);
44

5-
if (is_file(__DIR__ . '/../../autoload.php')) {
6-
require_once __DIR__ . '/../../autoload.php';
7-
}
8-
9-
// Need to skip the stub because phpcbf will be executed, not phpcs
10-
Phar::loadPhar(__DIR__ . '/phpcs.phar', 'phpcs.phar');
11-
require_once "phar://phpcs.phar/autoload.php";
5+
require_once __DIR__ . '/src/Autoloader.php';
6+
Spaze\PHPCSPhar\Autoloader::load();
127

8+
Spaze\PHPCSPhar\StandardsInstaller::install();
139
$status = (new PHP_CodeSniffer\Runner())->runPHPCBF();
1410
exit($status);

‎site/vendor/spaze/phpcs-phar/phpcs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<?php
33
declare(strict_types = 1);
44

5-
if (is_file(__DIR__ . '/../../autoload.php')) {
6-
require_once __DIR__ . '/../../autoload.php';
7-
}
5+
require_once __DIR__ . '/src/Autoloader.php';
6+
Spaze\PHPCSPhar\Autoloader::load();
87

9-
// Require is enough to execute the phar stub that will run the tool,
10-
// see https://www.php.net/phar.createdefaultstub for more info
11-
require_once __DIR__ . '/phpcs.phar';
8+
Spaze\PHPCSPhar\StandardsInstaller::install();
9+
$status = (new PHP_CodeSniffer\Runner())->runPHPCS();
10+
exit($status);

‎site/vendor/spaze/phpcs-phar/src/Autoloader.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
declare(strict_types = 1);
3+
4+
namespace Spaze\PHPCSPhar;
5+
6+
use Phar;
7+
8+
class Autoloader
9+
{
10+
11+
public static function load(): void
12+
{
13+
$autoloadFiles = [
14+
__DIR__ . '/../vendor/autoload.php',
15+
__DIR__ . '/../../../autoload.php',
16+
];
17+
18+
$autoloadLoaded = false;
19+
foreach ($autoloadFiles as $autoloadFile) {
20+
if (is_file($autoloadFile)) {
21+
require_once $autoloadFile;
22+
$autoloadLoaded = true;
23+
break;
24+
}
25+
}
26+
27+
if (!$autoloadLoaded) {
28+
fwrite(STDERR, "Install packages using Composer.\n");
29+
exit(254);
30+
}
31+
32+
Phar::loadPhar(__DIR__ . '/../phpcs.phar', 'phpcs.phar');
33+
require_once 'phar://phpcs.phar/autoload.php';
34+
}
35+
36+
}

‎site/vendor/spaze/phpcs-phar/src/StandardsInstaller.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
declare(strict_types = 1);
3+
4+
namespace Spaze\PHPCSPhar;
5+
6+
use Composer\InstalledVersions;
7+
use PHP_CodeSniffer\Config;
8+
9+
class StandardsInstaller
10+
{
11+
12+
public static function install(): void
13+
{
14+
if (!Config::getConfigData('installed_paths')) {
15+
$packages = InstalledVersions::getInstalledPackagesByType('phpcodesniffer-standard');
16+
$packages = array_unique($packages);
17+
sort($packages);
18+
$paths = [];
19+
foreach ($packages as $package) {
20+
$paths[] = InstalledVersions::getInstallPath($package);
21+
}
22+
Config::setConfigData('installed_paths', implode(',', $paths), true);
23+
}
24+
}
25+
26+
}

0 commit comments

Comments
 (0)