Skip to content

Commit aac8f24

Browse files
gharlangharlan
authored
Update vendors (redaxo#5017)
1 parent d031c4c commit aac8f24

Some content is hidden

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

47 files changed

+1189
-408
lines changed

‎.tools/psalm/baseline-taint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
2+
<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
33
<file src="redaxo/src/core/lib/response.php">
44
<TaintedHeader occurrences="1">
55
<code>$str</code>

‎.tools/psalm/baseline.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
2+
<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
33
<file src="redaxo/src/addons/backup/lib/backup.php">
44
<MixedArgument occurrences="5">
55
<code>$column</code>
@@ -1526,9 +1526,6 @@
15261526
<code>$metaSidebar</code>
15271527
<code>$subject</code>
15281528
</MixedAssignment>
1529-
<MixedMethodCall occurrences="1">
1530-
<code>getSubject</code>
1531-
</MixedMethodCall>
15321529
<MixedOperand occurrences="2">
15331530
<code>$metaSidebar</code>
15341531
<code>$pages[$prefix]</code>

‎composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
"friendsofphp/php-cs-fixer": "3.4.0",
1515
"friendsofredaxo/linter": "1.3.0",
1616
"phpstan/extension-installer": "1.1.0",
17-
"phpstan/phpstan": "1.3.0",
17+
"phpstan/phpstan": "1.3.3",
1818
"phpstan/phpstan-deprecation-rules": "1.0.0",
1919
"phpstan/phpstan-phpunit": "1.0.0",
20-
"phpstan/phpstan-symfony": "1.0.4",
20+
"phpstan/phpstan-symfony": "1.0.6",
2121
"phpunit/phpunit": "^9.5",
2222
"psalm/plugin-phpunit": "0.16.1",
23-
"psalm/plugin-symfony": "3.1.0",
24-
"rector/rector": "0.12.10",
23+
"psalm/plugin-symfony": "3.1.2",
24+
"rector/rector": "0.12.12",
2525
"redaxo/php-cs-fixer-config": "1.0.0",
2626
"redaxo/psalm-plugin": "1.0.0",
27-
"vimeo/psalm": "4.16.1"
27+
"vimeo/psalm": "4.18.1"
2828
},
2929
"replace": {
3030
"erusev/parsedown": "1.7.4",
3131
"erusev/parsedown-extra": "0.8.1",
32-
"filp/whoops": "2.14.4",
32+
"filp/whoops": "2.14.5",
3333
"itsgoingd/clockwork": "v5.1.3",
3434
"phpmailer/phpmailer": "v6.5.3",
3535
"psr/container": "1.1.1",
3636
"psr/http-message": "1.0.1",
3737
"psr/log": "1.1.4",
3838
"ramsey/collection": "1.2.2",
3939
"ramsey/http-range": "1.0.0",
40-
"scssphp/scssphp": "v1.9.0",
40+
"scssphp/scssphp": "v1.10.0",
4141
"splitbrain/php-archive": "1.2.1",
4242
"symfony/console": "v5.3.13",
4343
"symfony/deprecation-contracts": "v2.5.0",
@@ -46,8 +46,8 @@
4646
"symfony/polyfill-php70": "*",
4747
"symfony/polyfill-php72": "*",
4848
"symfony/polyfill-php73": "*",
49-
"symfony/polyfill-php80": "v1.23.1",
50-
"symfony/polyfill-php81": "v1.23.0",
49+
"symfony/polyfill-php80": "v1.24.0",
50+
"symfony/polyfill-php81": "v1.24.0",
5151
"symfony/service-contracts": "v2.5.0",
5252
"symfony/string": "v5.4.2",
5353
"symfony/var-dumper": "v5.3.13",

‎phpstan.neon.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ parameters:
4747
- '#Unsafe usage of new static\(\)\.#'
4848
- '#Constructor of class rex_form_.*_element has an unused parameter \$tag.#'
4949
- '#^Offset .* on .* always exists#'
50-
- '#Attribute class (?:AllowDynamicProperties|ReturnTypeWillChange|JetBrains\\PhpStorm\\Deprecated) does not exist\.#'
50+
- '#Attribute class (?:AllowDynamicProperties|JetBrains\\PhpStorm\\Deprecated) does not exist\.#'
5151
- '#Parameter \#2 \$algo of function password_.+ expects int, string given\.#'
5252
-
5353
message: '#.*deprecated.*#'

‎psalm.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<UndefinedAttributeClass>
6161
<errorLevel type="suppress">
6262
<referencedClass name="AllowDynamicProperties"/>
63-
<referencedClass name="ReturnTypeWillChange"/>
6463
<referencedClass name="JetBrains\PhpStorm\Deprecated"/>
6564
</errorLevel>
6665
</UndefinedAttributeClass>
@@ -100,6 +99,7 @@
10099
</RawObjectIteration>
101100
<RedundantCastGivenDocblockType errorLevel="info" />
102101
<RedundantConditionGivenDocblockType errorLevel="info" />
102+
<RedundantFunctionCallGivenDocblockType errorLevel="info" />
103103
<UnresolvableInclude errorLevel="suppress" />
104104
<UnsafeInstantiation errorLevel="info" />
105105
<!-- level 4 issues -->

‎redaxo/src/addons/be_style/assets/css/styles.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redaxo/src/addons/be_style/composer.lock

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redaxo/src/addons/be_style/plugins/redaxo/assets/css/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/composer.json

+13-10
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@
4242
"symfony/phpunit-bridge": "^5.1",
4343
"thoughtbot/bourbon": "^7.0",
4444
"twbs/bootstrap": "~5.0",
45-
"twbs/bootstrap4": "4.6.0",
45+
"twbs/bootstrap4": "4.6.1",
4646
"zurb/foundation": "~6.5"
4747
},
4848
"repositories": [
4949
{
5050
"type": "package",
5151
"package": {
5252
"name": "sass/sass-spec",
53-
"version": "2021.09.15",
53+
"version": "2021.11.30",
5454
"source": {
5555
"type": "git",
5656
"url": "https://github.com/sass/sass-spec.git",
57-
"reference": "eb2d7a0865c1faf0b55a39ff962b24aca9b4c955"
57+
"reference": "ee5b460ac84b1ce27b86e22c0252b4296444cf3a"
5858
},
5959
"dist": {
6060
"type": "zip",
61-
"url": "https://api.github.com/repos/sass/sass-spec/zipball/eb2d7a0865c1faf0b55a39ff962b24aca9b4c955",
62-
"reference": "eb2d7a0865c1faf0b55a39ff962b24aca9b4c955",
61+
"url": "https://api.github.com/repos/sass/sass-spec/zipball/ee5b460ac84b1ce27b86e22c0252b4296444cf3a",
62+
"reference": "ee5b460ac84b1ce27b86e22c0252b4296444cf3a",
6363
"shasum": ""
6464
}
6565
}
@@ -86,23 +86,26 @@
8686
"type": "package",
8787
"package": {
8888
"name": "twbs/bootstrap4",
89-
"version": "v4.6.0",
89+
"version": "v4.6.1",
9090
"source": {
9191
"type": "git",
9292
"url": "https://github.com/twbs/bootstrap.git",
93-
"reference": "6ffb0b48e455430f8a5359ed689ad64c1143fac2"
93+
"reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10"
9494
},
9595
"dist": {
9696
"type": "zip",
97-
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/6ffb0b48e455430f8a5359ed689ad64c1143fac2",
98-
"reference": "6ffb0b48e455430f8a5359ed689ad64c1143fac2",
97+
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/043a03c95a2ad6738f85b65e53b9dbdfb03b8d10",
98+
"reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10",
9999
"shasum": ""
100100
}
101101
}
102102
}
103103
],
104104
"bin": ["bin/pscss"],
105105
"config": {
106-
"sort-packages": true
106+
"sort-packages": true,
107+
"allow-plugins": {
108+
"bamarni/composer-bin-plugin": true
109+
}
107110
}
108111
}

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/src/Base/Range.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class Range
3434
/**
3535
* Initialize range
3636
*
37-
* @param integer|float $first
38-
* @param integer|float $last
37+
* @param int|float $first
38+
* @param int|float $last
3939
*/
4040
public function __construct($first, $last)
4141
{
@@ -46,9 +46,9 @@ public function __construct($first, $last)
4646
/**
4747
* Test for inclusion in range
4848
*
49-
* @param integer|float $value
49+
* @param int|float $value
5050
*
51-
* @return boolean
51+
* @return bool
5252
*/
5353
public function includes($value)
5454
{

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/src/Block.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
class Block
2323
{
2424
/**
25-
* @var string
25+
* @var string|null
2626
*/
2727
public $type;
2828

2929
/**
30-
* @var \ScssPhp\ScssPhp\Block
30+
* @var Block|null
3131
*/
3232
public $parent;
3333

@@ -37,17 +37,17 @@ class Block
3737
public $sourceName;
3838

3939
/**
40-
* @var integer
40+
* @var int
4141
*/
4242
public $sourceIndex;
4343

4444
/**
45-
* @var integer
45+
* @var int
4646
*/
4747
public $sourceLine;
4848

4949
/**
50-
* @var integer
50+
* @var int
5151
*/
5252
public $sourceColumn;
5353

@@ -67,7 +67,7 @@ class Block
6767
public $children;
6868

6969
/**
70-
* @var \ScssPhp\ScssPhp\Block|null
70+
* @var Block|null
7171
*/
7272
public $selfParent;
7373
}

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/src/Block/AtRootBlock.php

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
/**
4+
* SCSSPHP
5+
*
6+
* @copyright 2012-2020 Leaf Corcoran
7+
*
8+
* @license http://opensource.org/licenses/MIT MIT
9+
*
10+
* @link http://scssphp.github.io/scssphp
11+
*/
12+
13+
namespace ScssPhp\ScssPhp\Block;
14+
15+
use ScssPhp\ScssPhp\Block;
16+
use ScssPhp\ScssPhp\Type;
17+
18+
/**
19+
* @internal
20+
*/
21+
class AtRootBlock extends Block
22+
{
23+
/**
24+
* @var array|null
25+
*/
26+
public $selector;
27+
28+
/**
29+
* @var array|null
30+
*/
31+
public $with;
32+
33+
public function __construct()
34+
{
35+
$this->type = Type::T_AT_ROOT;
36+
}
37+
}

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/src/Block/CallableBlock.php

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
3+
/**
4+
* SCSSPHP
5+
*
6+
* @copyright 2012-2020 Leaf Corcoran
7+
*
8+
* @license http://opensource.org/licenses/MIT MIT
9+
*
10+
* @link http://scssphp.github.io/scssphp
11+
*/
12+
13+
namespace ScssPhp\ScssPhp\Block;
14+
15+
use ScssPhp\ScssPhp\Block;
16+
use ScssPhp\ScssPhp\Compiler\Environment;
17+
18+
/**
19+
* @internal
20+
*/
21+
class CallableBlock extends Block
22+
{
23+
/**
24+
* @var string
25+
*/
26+
public $name;
27+
28+
/**
29+
* @var array|null
30+
*/
31+
public $args;
32+
33+
/**
34+
* @var Environment|null
35+
*/
36+
public $parentEnv;
37+
38+
/**
39+
* @param string $type
40+
*/
41+
public function __construct($type)
42+
{
43+
$this->type = $type;
44+
}
45+
}

‎redaxo/src/addons/be_style/vendor/scssphp/scssphp/src/Block/ContentBlock.php

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
/**
4+
* SCSSPHP
5+
*
6+
* @copyright 2012-2020 Leaf Corcoran
7+
*
8+
* @license http://opensource.org/licenses/MIT MIT
9+
*
10+
* @link http://scssphp.github.io/scssphp
11+
*/
12+
13+
namespace ScssPhp\ScssPhp\Block;
14+
15+
use ScssPhp\ScssPhp\Block;
16+
use ScssPhp\ScssPhp\Compiler\Environment;
17+
use ScssPhp\ScssPhp\Type;
18+
19+
/**
20+
* @internal
21+
*/
22+
class ContentBlock extends Block
23+
{
24+
/**
25+
* @var array|null
26+
*/
27+
public $child;
28+
29+
/**
30+
* @var Environment|null
31+
*/
32+
public $scope;
33+
34+
public function __construct()
35+
{
36+
$this->type = Type::T_INCLUDE;
37+
}
38+
}

0 commit comments

Comments
 (0)