Skip to content

Commit

Permalink
Update packages (#346)
Browse files Browse the repository at this point in the history
 - 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
  • Loading branch information
spaze authored Jun 1, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents c7e4901 + 7335dc7 commit 1b276b2
Showing 89 changed files with 709 additions and 479 deletions.
141 changes: 79 additions & 62 deletions site/composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions site/vendor/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
'Spaze\\SubresourceIntegrity\\' => array($vendorDir . '/spaze/sri-macros/src'),
'Spaze\\PhpInfo\\' => array($vendorDir . '/spaze/phpinfo/src'),
'Spaze\\PHPStan\\Rules\\Disallowed\\' => array($vendorDir . '/spaze/phpstan-disallowed-calls/src'),
'Spaze\\PHPCSPhar\\' => array($vendorDir . '/spaze/phpcs-phar/src'),
'Spaze\\NonceGenerator\\' => array($vendorDir . '/spaze/nonce-generator/src'),
'Spaze\\Exports\\' => array($vendorDir . '/spaze/feed-exports/src'),
'Spaze\\Encryption\\' => array($vendorDir . '/spaze/encryption/src'),
5 changes: 5 additions & 0 deletions site/vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b
'Spaze\\SubresourceIntegrity\\' => 27,
'Spaze\\PhpInfo\\' => 14,
'Spaze\\PHPStan\\Rules\\Disallowed\\' => 31,
'Spaze\\PHPCSPhar\\' => 16,
'Spaze\\NonceGenerator\\' => 21,
'Spaze\\Exports\\' => 14,
'Spaze\\Encryption\\' => 17,
@@ -117,6 +118,10 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b
array (
0 => __DIR__ . '/..' . '/spaze/phpstan-disallowed-calls/src',
),
'Spaze\\PHPCSPhar\\' =>
array (
0 => __DIR__ . '/..' . '/spaze/phpcs-phar/src',
),
'Spaze\\NonceGenerator\\' =>
array (
0 => __DIR__ . '/..' . '/spaze/nonce-generator/src',
159 changes: 88 additions & 71 deletions site/vendor/composer/installed.json

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions site/vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -326,18 +326,18 @@
),
),
'phpstan/phpdoc-parser' => array(
'pretty_version' => '1.29.0',
'version' => '1.29.0.0',
'reference' => '536889f2b340489d328f5ffb7b02bb6b183ddedc',
'pretty_version' => '1.29.1',
'version' => '1.29.1.0',
'reference' => 'fcaefacf2d5c417e928405b71b400d4ce10daaf4',
'type' => 'library',
'install_path' => __DIR__ . '/../phpstan/phpdoc-parser',
'aliases' => array(),
'dev_requirement' => true,
),
'phpstan/phpstan' => array(
'pretty_version' => '1.11.2',
'version' => '1.11.2.0',
'reference' => '0d5d4294a70deb7547db655c47685d680e39cfec',
'pretty_version' => '1.11.3',
'version' => '1.11.3.0',
'reference' => 'e64220a05c1209fc856d58e789c3b7a32c0bb9a5',
'type' => 'library',
'install_path' => __DIR__ . '/../phpstan/phpstan',
'aliases' => array(),
@@ -412,7 +412,7 @@
'roave/security-advisories' => array(
'pretty_version' => 'dev-latest',
'version' => 'dev-latest',
'reference' => '0ec6bad5f4523eda2514e89d5ea48cde6ebe7f99',
'reference' => '255803f702f07bee1a4edb0b079348c198603514',
'type' => 'metapackage',
'install_path' => null,
'aliases' => array(
@@ -502,9 +502,9 @@
'dev_requirement' => false,
),
'spaze/phpcs-phar' => array(
'pretty_version' => '3.10.1',
'version' => '3.10.1.0',
'reference' => 'abeff33a0d955e8de08f67bb996c0a5ef211d343',
'pretty_version' => '3.10.1.1',
'version' => '3.10.1.1',
'reference' => '12cb250f680472045d8136e05b9104cbb904389d',
'type' => 'library',
'install_path' => __DIR__ . '/../spaze/phpcs-phar',
'aliases' => array(),
@@ -562,9 +562,9 @@
),
),
'symfony/cache' => array(
'pretty_version' => 'v7.0.7',
'version' => '7.0.7.0',
'reference' => '48e3508338987d63b0114a00c208c4cbb76e5303',
'pretty_version' => 'v7.1.0',
'version' => '7.1.0.0',
'reference' => 'c36a10e6456b32e40d1ef516b3a2749883f9117b',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/cache',
'aliases' => array(),
@@ -586,9 +586,9 @@
),
),
'symfony/config' => array(
'pretty_version' => 'v7.0.7',
'version' => '7.0.7.0',
'reference' => 'f66f908a975500aa4594258bf454dc66e3939eac',
'pretty_version' => 'v7.1.0',
'version' => '7.1.0.0',
'reference' => 'c4a60be1c7ec93aa8b7f19e07b6427143a502ef4',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/config',
'aliases' => array(),
@@ -604,9 +604,9 @@
'dev_requirement' => false,
),
'symfony/filesystem' => array(
'pretty_version' => 'v7.0.7',
'version' => '7.0.7.0',
'reference' => 'cc168be6fbdcdf3401f50ae863ee3818ed4338f5',
'pretty_version' => 'v7.1.0',
'version' => '7.1.0.0',
'reference' => '8ecdde25881598f86cdd7cfe8b25302b66a402e9',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/filesystem',
'aliases' => array(),
@@ -640,9 +640,9 @@
'dev_requirement' => false,
),
'symfony/translation' => array(
'pretty_version' => 'v7.0.7',
'version' => '7.0.7.0',
'reference' => '1515e03afaa93e6419aba5d5c9d209159317100b',
'pretty_version' => 'v7.1.0',
'version' => '7.1.0.0',
'reference' => '583d18e461eada8270ca44b7d99f07abf1ab048e',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/translation',
'aliases' => array(),
@@ -664,18 +664,18 @@
),
),
'symfony/var-exporter' => array(
'pretty_version' => 'v7.0.7',
'version' => '7.0.7.0',
'reference' => 'cdecc0022e40e90340ba1a59a3d5ccf069777078',
'pretty_version' => 'v7.1.0',
'version' => '7.1.0.0',
'reference' => '353688d70dcd43e8f7a5cc13b9afba49d4946c39',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-exporter',
'aliases' => array(),
'dev_requirement' => false,
),
'texy/texy' => array(
'pretty_version' => 'v3.2.1',
'version' => '3.2.1.0',
'reference' => '99f4261956fda6fb3a28c1264ff33abce725044b',
'pretty_version' => 'v3.2.2',
'version' => '3.2.2.0',
'reference' => 'cd1068e6abef89808f969347076aaaace9215bd5',
'type' => 'library',
'install_path' => __DIR__ . '/../texy/texy',
'aliases' => array(),
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ class TemplateTagValueNode implements PhpDocTagValueNode

use NodeAttributes;

/** @var string */
/** @var non-empty-string */
public $name;

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

/**
* @param non-empty-string $name
*/
public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null)
{
$this->name = $name;
4 changes: 4 additions & 0 deletions site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php
Original file line number Diff line number Diff line change
@@ -510,6 +510,10 @@ public function parseTemplateTagValue(
$description = '';
}

if ($name === '') {
throw new LogicException('Template tag name cannot be empty.');
}

return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default);
}

Binary file modified site/vendor/phpstan/phpstan/phpstan.phar
Binary file not shown.
26 changes: 13 additions & 13 deletions site/vendor/phpstan/phpstan/phpstan.phar.asc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZQlJ4ACgkQUcZzBf/C
5cDlwBAAj3ya2zqDT/zNrlDojBaTP0dOnCe4/caxUXlGiwjadGLYDiJBSTx01XQx
VayI1rDWh9XZ90Lo9CxP2hG6y3yQ/fBD9Z5QP/Zt/YLG03m91pUVn65do6U0D/ff
SXD8G50j3i763Kysb5MxlJXQ3RZrFh+6teGcNkzkU2rI39XVBdeGN/QJ56kJXsqj
gb4a9FKMF6kkVJ1kWohI4g0iTvJ/Jgu1io5hoA6z39Ly2LH9Rx/HRpqQm6iTZz66
ycBmPZC3K+XmeoIuM6vMeTSJ3qHUzu2MNa8vWQpsXCqnMakwef5Frf+TN6iZcPlr
MTQQdKIjpwSjgzV0KNa/2T8rd/yMBlnjFO88DzBWjUfqlB4U19SrBHQIpl53bAPp
YGMIMoyZYnbp1xqyrJ9jIZbs/AXOZZh4BDxHTyUyBUKSHP1DvB54Vp93n4C8KyM8
+i1p+M2CsUu3+oqxAIl62G2JWLl754nQ9vkMRKG7aPZ51ip8ZoCG88uFelK6NrGj
eeIWnIuLKY+1LONCgFkslzLhDNGnq4ROQ+6tEmdS45MbsWeHpf5NQoJ5xHrSj60I
hI0lZ8GAuwUAwwxqNyDl5uIeuJWNmlbV5hrbesikhPE41kQdoyx5tx8Mu/VJNBdB
67EbAWK9/z5FZMqATiCiYcTIJeEA4Dt4Pd7MFYbNI5jDH0pZ4Es=
=AcMg
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZZ1kYACgkQUcZzBf/C
5cBzjA/5Ab6Ey+9h5ZHEmNsOZD+owcARovpMU/crDFT35kjr5q9I0Z3zlLGHWzI3
dvLRrfwWF2JpA7oGdbrUbtFJ6bClikg/RAzWHSikHsCcFkQ1lorjxJxJaX8K+NW9
P5f0IFEL/pfQQ/5YdoEvH6Ah4BiyV9Yu99V8k3bINJx6dxfAX8tRTNAbFfe+EmU0
/Wpq7xQL3nAyA78jqbiYvi3x/7k7l8FRFpO/cQxjdmCkJZ5nMfZN3WnT4WF/WycC
oP17wWdLno74QNJR9Jt5Sb4SFWvrFNgjYQbjQICxfHPzdczfEKo9CoZxEB+rPJZU
/OD1umIIgT4e5XdgJZb9jBrl/FF2C2VJD1HreoDy6KFIw8ZZdqbwprLVG1IIIfG8
bRhCLZjbscSqQgiay4Lo1SVJv9YOQT8mPtIcKy4LF7rCGhJ2bBqd8Z53j9Gmyktt
ENAQB4cipFiJ3O/YHZ/Pi32yAqouSNKnJ+JSG7AozjyX4Zq06F0u9LSR7GcArlok
pp2J7EU9YMazPC73wrUFn0GD9nr/YUeHu9eYPi9YLfrPxEFJzFQtAziuzyPCgneU
Ce4Fe1BDumB5Lx4c4chqOnD4FH/xp57RPNzKUXrM4pcc3axLjM865I1/MW4+pjnV
/RxGSy5hd+kCPPc5bV84YDY38/ZLGBkgCa7EY5h0RK7sEkNngeg=
=tbKK
-----END PGP SIGNATURE-----
5 changes: 0 additions & 5 deletions site/vendor/spaze/phpcs-phar/CodeSniffer.conf

This file was deleted.

15 changes: 13 additions & 2 deletions site/vendor/spaze/phpcs-phar/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# PHP_CodeSniffer phar releases

[![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)
[![PHP Tests](https://github.com/spaze/phpcs-phar/actions/workflows/php.yml/badge.svg)](https://github.com/spaze/phpcs-phar/actions/workflows/php.yml)

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

@@ -27,24 +28,34 @@ There are several reasons for that:
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
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

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:
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:

### Auto-install the available standards
If the `CodeSniffer.conf` file doesn't exist, this package will find and auto-install all available coding standards on each execution.
The altered configuration is not persisted, no config file will be created, because it would be removed on each package update anyway.
This is the recommended option emulating the Standards Composer Installer Plugin to a certain point.

### Modify the config file
1. In your project, run
```
vendor/bin/phpcs --config-set installed_paths ../../slevomat/coding-standard
```
3. Locate the `CodeSniffer.conf` file in your `vendor/spaze/phpcs-phar` directory
4. Edit the path to the installed standard and make it an absolute path, for example change
4. Edit the path to the installed standard and make it an absolute path, for example change
```php
'installed_paths' => '../../slevomat/coding-standard'
```
to
```php
'installed_paths' => __DIR__ . '/../../slevomat/coding-standard'
```
Please be aware that the `CodeSniffer.conf` file will be removed on each package update.

### Install the standard using an absolute path
In your project, run
```
vendor/bin/phpcs --config-set installed_paths $(realpath vendor/slevomat/coding-standard)
```
or use any absolute path for the `installed_paths` value.

Please be aware that the `CodeSniffer.conf` file will be removed on each package update.
20 changes: 19 additions & 1 deletion site/vendor/spaze/phpcs-phar/composer.json
Original file line number Diff line number Diff line change
@@ -17,8 +17,26 @@
"phpcsstandards/php_codesniffer": "3.10.1",
"squizlabs/php_codesniffer": "3.10.1"
},
"require": {
"composer-runtime-api": "^2.1"
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.4",
"php-parallel-lint/php-console-highlighter": "^1.0"
},
"autoload": {
"psr-4": {
"Spaze\\PHPCSPhar\\": "src"
}
},
"bin": [
"phpcbf",
"phpcs"
]
],
"scripts": {
"lint": "vendor/bin/parallel-lint --colors phpcs phpcbf",
"test": [
"@lint"
]
}
}
10 changes: 3 additions & 7 deletions site/vendor/spaze/phpcs-phar/phpcbf
Original file line number Diff line number Diff line change
@@ -2,13 +2,9 @@
<?php
declare(strict_types = 1);

if (is_file(__DIR__ . '/../../autoload.php')) {
require_once __DIR__ . '/../../autoload.php';
}

// Need to skip the stub because phpcbf will be executed, not phpcs
Phar::loadPhar(__DIR__ . '/phpcs.phar', 'phpcs.phar');
require_once "phar://phpcs.phar/autoload.php";
require_once __DIR__ . '/src/Autoloader.php';
Spaze\PHPCSPhar\Autoloader::load();

Spaze\PHPCSPhar\StandardsInstaller::install();
$status = (new PHP_CodeSniffer\Runner())->runPHPCBF();
exit($status);
11 changes: 5 additions & 6 deletions site/vendor/spaze/phpcs-phar/phpcs
Original file line number Diff line number Diff line change
@@ -2,10 +2,9 @@
<?php
declare(strict_types = 1);

if (is_file(__DIR__ . '/../../autoload.php')) {
require_once __DIR__ . '/../../autoload.php';
}
require_once __DIR__ . '/src/Autoloader.php';
Spaze\PHPCSPhar\Autoloader::load();

// Require is enough to execute the phar stub that will run the tool,
// see https://www.php.net/phar.createdefaultstub for more info
require_once __DIR__ . '/phpcs.phar';
Spaze\PHPCSPhar\StandardsInstaller::install();
$status = (new PHP_CodeSniffer\Runner())->runPHPCS();
exit($status);
36 changes: 36 additions & 0 deletions site/vendor/spaze/phpcs-phar/src/Autoloader.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php
declare(strict_types = 1);

namespace Spaze\PHPCSPhar;

use Phar;

class Autoloader
{

public static function load(): void
{
$autoloadFiles = [
__DIR__ . '/../vendor/autoload.php',
__DIR__ . '/../../../autoload.php',
];

$autoloadLoaded = false;
foreach ($autoloadFiles as $autoloadFile) {
if (is_file($autoloadFile)) {
require_once $autoloadFile;
$autoloadLoaded = true;
break;
}
}

if (!$autoloadLoaded) {
fwrite(STDERR, "Install packages using Composer.\n");
exit(254);
}

Phar::loadPhar(__DIR__ . '/../phpcs.phar', 'phpcs.phar');
require_once 'phar://phpcs.phar/autoload.php';
}

}
26 changes: 26 additions & 0 deletions site/vendor/spaze/phpcs-phar/src/StandardsInstaller.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
declare(strict_types = 1);

namespace Spaze\PHPCSPhar;

use Composer\InstalledVersions;
use PHP_CodeSniffer\Config;

class StandardsInstaller
{

public static function install(): void
{
if (!Config::getConfigData('installed_paths')) {
$packages = InstalledVersions::getInstalledPackagesByType('phpcodesniffer-standard');
$packages = array_unique($packages);
sort($packages);
$paths = [];
foreach ($packages as $package) {
$paths[] = InstalledVersions::getInstallPath($package);
}
Config::setConfigData('installed_paths', implode(',', $paths), true);
}
}

}
Loading

0 comments on commit 1b276b2

Please sign in to comment.