Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit 9c26c46

Browse files
prisisprisis
authored
feat: upgraded to php7.4 (#799)
1 parent 3b9609b commit 9c26c46

File tree

162 files changed

+377
-419
lines changed

Some content is hidden

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

162 files changed

+377
-419
lines changed

‎.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ indent_size = 2
1414

1515
[src/Viserio/Component/Container/Tests/Fixture/Compiled/*.txt]
1616
trim_trailing_whitespace = false
17+
[src/Viserio/Component/Container/Tests/Fixture/Proxy/*.php]
18+
trim_trailing_whitespace = false
1719
[src/Viserio/Component/Exception/Tests/Console/HandlerTest.php]
1820
trim_trailing_whitespace = false

‎.github/workflows/code-coverage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2-beta
18+
- uses: actions/checkout@v2
1919

2020
- name: "Setup PHP"
2121
uses: shivammathur/[email protected]
2222
with:
23-
php-version: "7.3"
23+
php-version: "7.4"
2424
extensions: mbstring, xml, ctype, iconv, zip, dom, fileinfo, intl, sodium, curl, pdo, pdo_sqlite, inotify, pcntl, posix, xdebug
2525
ini-values: pcov.directory=api, date.timezone=Europe/Berlin, opcache.enable_cli=1, serialize_precision=14
2626
coverage: none

‎.github/workflows/coding-standard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2-beta
18+
- uses: actions/checkout@v2
1919
- name: Setup PHP
2020
uses: shivammathur/[email protected]
2121
with:
22-
php-version: 7.3
22+
php-version: 7.4
2323
extensions: mbstring, xml, ctype, iconv, zip, dom, fileinfo
2424
tools: composer
2525

‎.github/workflows/continuous-integration-linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
operating-system: [ubuntu-latest]
19-
php-versions: ["7.3", "7.4"]
19+
php-versions: ["7.4"]
2020
dependencies: ["highest", "lowest"]
2121

2222
name: "PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} OS and with ${{ matrix.dependencies }} dependencies"
2323
steps:
24-
- uses: actions/checkout@v2-beta
24+
- uses: actions/checkout@v2
2525
with:
2626
fetch-depth: 2
2727

‎.github/workflows/continuous-integration-windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
operating-system: [windows-latest]
19-
php-versions: ["7.3", "7.4"]
19+
php-versions: ["7.4"]
2020
dependencies: ["highest", "lowest"]
2121

2222
name: "PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} OS and with ${{ matrix.dependencies }} dependencies"
2323
steps:
24-
- uses: actions/checkout@v2-beta
24+
- uses: actions/checkout@v2
2525
with:
2626
fetch-depth: 2
2727

‎.github/workflows/php-audit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
max-parallel: 2
1818
matrix:
1919
operating-system: [ubuntu-latest]
20-
php-versions: ["7.3"]
20+
php-versions: ["7.4"]
2121
dependencies: ["highest", "lowest"]
2222

2323
name: "Audit on PHP ${{ matrix.php-versions }} and ${{ matrix.operating-system }} OS"
2424
steps:
25-
- uses: actions/checkout@v2-beta
25+
- uses: actions/checkout@v2
2626

2727
- name: Setup PHP
2828
uses: shivammathur/[email protected]
2929
with:
30-
php-version: 7.3
30+
php-version: ${{ matrix.php-versions }}
3131
extensions: mbstring, xml, ctype, iconv, zip, dom, fileinfo, intl, sodium, curl, pdo, pdo_sqlite, inotify, pcntl, posix
3232
tools: composer
3333

‎.github/workflows/split.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090

9191
name: "Split ${{ matrix.dependencies }}"
9292
steps:
93-
- uses: actions/checkout@v2-beta
93+
- uses: actions/checkout@v2
9494

9595
- name: "git-bash"
9696
uses: fnkr/[email protected]

‎.github/workflows/static-analyze.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161

6262
name: "${{ matrix.dependencies }}"
6363
steps:
64-
- uses: actions/checkout@v2-beta
64+
- uses: actions/checkout@v2
6565
with:
6666
fetch-depth: 2
6767

6868
- name: "Setup PHP"
6969
uses: shivammathur/[email protected]
7070
with:
71-
php-version: 7.3
71+
php-version: 7.4
7272
extensions: mbstring, xml, ctype, iconv, zip, dom, fileinfo, intl, inotify, pcntl, posix
7373
pecl: true
7474
tools: composer

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
include:
1212
- stage: Coverage
13-
php: 7.3
13+
php: 7.4
1414
env: REMOVE_XDEBUG=false PHPUNIT_COVERAGE=true
1515
before_install:
1616
- composer global require --no-progress --no-scripts --no-plugins narrowspark/automatic-composer-prefetcher dev-master

‎composer.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^7.3",
21+
"php": "^7.4",
2222
"ext-curl": "*",
2323
"ext-fileinfo": "*",
2424
"ext-json": "*",
@@ -29,7 +29,7 @@
2929
"cache/void-adapter": "^1.0.0",
3030
"cakephp/chronos": "^1.0.4",
3131
"dragonmantank/cron-expression": "^2.1.0",
32-
"egulias/email-validator": "^2.1",
32+
"egulias/email-validator": "^2.1.13",
3333
"league/uri-schemes": "^1.2",
3434
"monolog/monolog": "^2.0.0",
3535
"narrowspark/arr": "^2.1",
@@ -48,7 +48,7 @@
4848
"psr/http-server-middleware": "^1.0.0",
4949
"psr/log": "^1.1.0",
5050
"respect/validation": "^1.1.15",
51-
"swiftmailer/swiftmailer": "^6.0.0",
51+
"swiftmailer/swiftmailer": "^6.2.3",
5252
"symfony/console": "^4.3.8 || ^5.0.0",
5353
"symfony/debug": "^4.3.8 || ^5.0.0",
5454
"symfony/filesystem": "^4.3.8 || ^5.0.0",
@@ -84,14 +84,13 @@
8484
"narrowspark/testing-helper": "^8.0.2",
8585
"nikic/php-parser": "^4.2.1",
8686
"nyholm/nsa": "^1.1.0",
87-
"ocramius/proxy-manager": "^2.2.3",
87+
"ocramius/proxy-manager": "^2.5.1",
8888
"opis/closure": "^3.0",
8989
"phpunit/phpunit": "8.2.*",
9090
"slam/phpstan-extensions": "^4.0.0",
9191
"symfony/yaml": "^4.3.8 || ^5.0.0",
9292
"voku/stringy": "^5.2.0",
93-
"yosymfony/toml": "^1.0.3",
94-
"zendframework/zend-code": "^3.3.2"
93+
"yosymfony/toml": "^1.0.3"
9594
},
9695
"autoload": {
9796
"exclude-from-classmap": [

‎docker-compose-32bit.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ services:
44
build:
55
context: ./.docker/php/32bit/
66
args:
7-
PHP_VERSION: "7.3.0"
8-
XDEBUG_VERSION: "2.7.0beta1"
7+
PHP_VERSION: "7.4.0"
8+
XDEBUG_VERSION: "2.9.0"
99
INSTALL_XDEBUG: "false"
10-
INSTALL_CODING_STANDARD: "true"
1110
expose:
1211
- 9000
1312
volumes:

‎docker-compose.yml

-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
version: '3'
22
services:
3-
php73_64:
4-
build:
5-
context: ./.docker/php/64bit/
6-
args:
7-
PHP_VERSION: "7.3.0"
8-
XDEBUG_VERSION: "2.9.0"
9-
INSTALL_XDEBUG: "true"
10-
expose:
11-
- 9000
12-
volumes:
13-
- data:/var/www/framework
14-
links:
15-
- mysql
16-
- redis
17-
tty: true
18-
193
php74_64:
204
build:
215
context: ./.docker/php/64bit/

‎src/Viserio/Bridge/Dotenv/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio DotEnv Bridge</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Bridge/Dotenv/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
],
2727
"require": {
28-
"php": "^7.3",
28+
"php": "^7.4",
2929
"vlucas/phpdotenv": "^3.6.0"
3030
},
3131
"require-dev": {

‎src/Viserio/Bridge/Monolog/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Monolog Bridge</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Bridge/Monolog/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
],
2727
"require": {
28-
"php": "^7.3",
28+
"php": "^7.4",
2929
"monolog/monolog": "^2.0.0",
3030
"viserio/events-contract": "^1.0@dev",
3131
"viserio/log-contract": "^1.0@dev"

‎src/Viserio/Bridge/Phpstan/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio DotEnv Bridge</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Bridge/Phpstan/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
],
2626
"require": {
27-
"php": "^7.3",
27+
"php": "^7.4",
2828
"phpstan/phpstan": "^0.12.0"
2929
},
3030
"require-dev": {

‎src/Viserio/Bridge/Twig/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Twig Bridge</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Bridge/Twig/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^7.3",
26+
"php": "^7.4",
2727
"ext-json": "*",
2828
"twig/twig": "^2.11.0 || ^3.0.0"
2929
},

‎src/Viserio/Component/Bus/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Bus Component</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Component/Bus/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
],
2626
"require": {
27-
"php": "^7.3",
27+
"php": "^7.4",
2828
"php-di/invoker": "^2.0.0",
2929
"psr/container": "^1.0.0",
3030
"viserio/bus-contract": "^1.0@dev",

‎src/Viserio/Component/Cache/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Cache Component</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Component/Cache/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
],
4040
"require": {
41-
"php": "^7.3",
41+
"php": "^7.4",
4242
"cache/array-adapter": "^1.0.0",
4343
"cache/void-adapter": "^1.0.0",
4444
"psr/container": "^1.0.0",

‎src/Viserio/Component/Config/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Config Component</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Component/Config/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^7.3",
26+
"php": "^7.4",
2727
"narrowspark/arr": "^2.1",
2828
"viserio/config-contract": "^1.0@dev",
2929
"viserio/parser-contract": "^1.0@dev"

‎src/Viserio/Component/Console/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Console Component</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

‎src/Viserio/Component/Console/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
],
2828
"require": {
29-
"php": "^7.3",
29+
"php": "^7.4",
3030
"php-di/invoker": "^2.0.0",
3131
"psr/container": "^1.0.0",
3232
"symfony/console": "^4.3.8 || ^5.0.0",

‎src/Viserio/Component/Container/LazyProxy/ProxyDumper.php

-8
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ public function getProxyCode(ObjectDefinitionContract $definition): string
7979

8080
$code = $this->strategy->generate($generator);
8181

82-
if (\version_compare(self::getProxyManagerVersion(), '2.2', '<')) {
83-
$code = \preg_replace(
84-
'/((?:\$(?:this|initializer|instance)->)?(?:publicProperties|initializer|valueHolder))[0-9a-f]++/',
85-
'${1}' . $this->getIdentifierSuffix($definition),
86-
$code
87-
);
88-
}
89-
9082
// fix for internal class extend
9183
$code = \preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);
9284

‎src/Viserio/Component/Container/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Viserio Container Component</h1>
22
<p align="center">
33
<a href="https://github.com/narrowspark/framework/releases"><img src="https://img.shields.io/packagist/v/narrowspark/framework.svg?style=flat-square"></a>
4-
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.3.0-8892BF.svg?style=flat-square"></a>
4+
<a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.4.0-8892BF.svg?style=flat-square"></a>
55
<a href="https://codecov.io/gh/narrowspark/framework"><img src="https://img.shields.io/codecov/c/github/narrowspark/framework/master.svg?style=flat-square"></a>
66
<a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
77
</p>

0 commit comments

Comments
 (0)